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 |
|
erik
|
4068a21b37
|
Edited view/sv/register_verify_eml.tpl via GitHub
|
2011-03-26 03:11:41 -07:00 |
|
|
erik
|
17b4f9f8a7
|
Edited view/sv/register_verify_eml.tpl via GitHub
|
2011-03-26 03:09:00 -07:00 |
|
|
erik
|
61ba37b1ed
|
Edited view/sv/register_verify_eml.tpl via GitHub
|
2011-03-22 12:11:15 -07:00 |
|
|
erik
|
e94ae8d396
|
commit001
|
2011-03-11 20:12:32 +01:00 |
|