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 |
|
Abinoam P. Marques Jr
|
914169472e
|
view/admin_remoteupdate.tpl - Friendika -> Friendica
|
2012-02-20 19:47:56 -03: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 |
|
Fabio Comuni
|
20ca451200
|
move js to js folder
|
2011-09-05 11:15:30 +02:00 |
|
|
Fabio Comuni
|
4fdc5ff30c
|
First test for friendika "live" update
|
2011-07-08 17:12:08 +02:00 |
|