clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,817 Commits 3 Branches 0 Tags 183 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
tommy tomson e37c4f69b4 add file_as-option to diabook-derivates 2012-03-22 06:54:18 +01:00