Alexander Kampmann
|
355c42cb30
|
Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
include/config.php
update.php
|
2012-04-05 13:39:15 +02:00 |
|
friendica
|
8aa2552372
|
add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)
|
2012-01-18 16:21:30 -08:00 |
|
Friendika
|
e35a5bac55
|
the rest of the english html templates except for htconfig
|
2011-04-07 23:10:43 -07:00 |
|
|
Friendika
|
4240a23a8a
|
i18n re-arrange
|
2010-11-15 23:27:12 -08:00 |
|
Mike Macgirvin
|
9a03834cef
|
simplify wording throughout application to concepts which do not need explanations.
|
2010-09-19 20:52:39 -07:00 |
|
|
Mike Macgirvin
|
ba8da761e6
|
more cleanup - start on ajax
|
2010-07-19 22:52:31 -07:00 |
|