clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6,333 Commits 3 Branches 0 Tags
1f8182a4533c097cfc06f877f3392be2e41d82b4
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
Alexander Kampmann
f208e7af36 tests for the template engine 2012-03-22 12:43:03 +01:00