Commit Graph

5 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
friendica 2820dba1e7 comix screenshot 2012-03-26 00:52:54 -07:00
friendica 808180ce5f missing tooltip for "file as" 2012-03-22 04:07:37 -07:00
friendica 56495e04b2 smooth the comix comment box 2012-03-21 06:48:04 -07:00
friendica 0dc4c3f484 add comix theme 2012-03-20 22:54:20 -07:00