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 |
|
Simon L'nu
|
81de5f7802
|
apply changes to templates to testbubble
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-02 13:59:28 -05: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 |
|
|
friendica
|
9e8053e3bd
|
fixing conversation updates
|
2011-11-24 16:42:12 -08:00 |
|
|
friendica
|
c568493f57
|
add expire_starred option, fix "delete selected" on some themes, new project name in email templates
|
2011-11-21 19:01:05 -08:00 |
|