Merge pull request #5129 from tobiasd/20180526-adminpanel
[friendica.git/.git] / .gitattributes
2016-05-25 rabuzarusMerge branch 'master' of ../save/merge/frio into frio_merge
2012-06-23 Vasudev KamathMerge branch 'master' of git://github.com/friendica...
2012-06-16 Hauke ZuehlMerge remote branch 'upstream/master'
2012-06-15 friendicaMerge https://github.com/friendica/friendica into pull
2012-06-14 friendicaRequired for github/Windows