Commit graph

3 commits

Author SHA1 Message Date
Fabio Comuni fdf50b8574 display settings: show theme screenshot on page load 2012-04-13 11:55:36 +02:00
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 c88674aaf2 theme preview for end users 2012-03-25 19:05:14 -07:00