Tobias Diekershoff f3d8da7d33 Merge branch 'master' into develop		2017-06-06 12:20:55 +02:00
..
fonts
install
lang	Merge pull request #3520 from AndyHee/3.5.2rc	2017-06-06 09:27:25 +02:00
php	Merge branch 'develop' of github.com:friendica/friendica into rewrites/coding-convention-split2-4-2	2017-05-11 14:54:26 +02:00
smarty3
templates	Update remaining "dir.friendi.ca" instances	2017-06-02 22:15:43 -04:00
theme	Merge branch 'master' into develop	2017-06-06 12:20:55 +02:00
.htaccess
custom_tinymce.css
global.css