Commit Graph

2 Commits (622b978a8444624b36b01853239a2959cb4a1bf5)

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
tommy tomson d4ac1f2a9c fixed star/unstar 2012-03-03 19:07:55 +01:00