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 |
|
Devlon Duthie
|
f7d055687e
|
- moved the header for profile permissions out of the scrolling div
- tweaks to the testbubble theme's nav
|
2011-10-04 11:10:57 -05:00 |
|
Friendika
|
58d474aa2d
|
switch to text mode group editor after 'n' contacts
|
2011-06-29 20:42:16 -07:00 |
|
|
Friendika
|
d4bb560e7f
|
small wording change
|
2011-04-12 21:37:54 -07:00 |
|
|
Friendika
|
080efe4d1e
|
missed file addition
|
2011-04-12 21:25:00 -07:00 |
|