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 |
|
Tobias Hößl
|
59766b944c
|
Some security against XSRF-attacks
|
2012-03-12 20:17:37 +00: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
|
f9d5aafe9c
|
finish moving english files
|
2010-11-16 20:13:18 -08:00 |
|
Mike Macgirvin
|
c3fd5ed732
|
one true profile photo, force nicknames
|
2010-07-19 19:09:58 -07:00 |
|
Mike Macgirvin
|
6348e70daa
|
Initial checkin
|
2010-07-01 16:48:07 -07:00 |
|