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
|
b9ca44678d
|
match the documentation
|
2010-12-19 19:55:03 -08:00 |
|
|
Friendika
|
f60f82727f
|
register/login timestamps
|
2010-12-16 16:35:45 -08:00 |
|
|
Friendika
|
3672335dec
|
15 gender choices, 12 sexual preference choices and 30 relationship status options are probably adequate. :-)
|
2010-11-29 20:56:54 -08:00 |
|
|
Friendika
|
5d47417711
|
more view cleanup
|
2010-11-15 21:06:44 -08:00 |
|