strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
6986 commits 2 branches 55 tags 148 MiB
Commit graph

2 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 af9f7da449 catalan translation 2012-03-08 16:29:22 -08:00