Commit graph

3 commits

Author SHA1 Message Date
Razlo
fc1c188a7e updated the templates to the {{}}, compared to 2015-05-17 02:40:51 +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
af9f7da449 catalan translation 2012-03-08 16:29:22 -08:00