friendica/friendica
6
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-11 22:11:34 +01:00
Code Issues Packages Projects Releases 2 Wiki Activity
6509 commits 3 branches 64 tags 244 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 f55779fd83 update tinymce to 3.5b2 to fix issues with FF 11 and pasting into code blocks 2012-03-20 20:47:31 -07:00