Commit Graph

6 Commits

Author SHA1 Message Date
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
Fabio Comuni 51d419e159 themes: use duepuntozero tpls as default 2012-03-26 09:09:14 +02:00
friendica 8fb0ea4048 bugs #312, #313 2012-03-06 14:27:53 -08: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 98a8693e9e quattro: style network widget 2012-01-06 09:27:05 +01:00
friendica c3ada095f4 network select widget 2012-01-05 20:40:48 -08:00