Merge pull request #2190 from annando/1512-getload
[friendica.git] / docblox.dist.xml
2012-05-16 friendicaMerge https://github.com/friendica/dir into dpull
2012-04-11 MichaelMerge branch 'master' of github.com:annando/friendica
2012-03-09 Michael VogelMerge commit 'upstream/master'
2012-03-09 Tobias HößlMerge branch 'master' of git://github.com/friendica...
2012-03-07 Alexander Kampmannmerged
2012-03-06 Fabio ComuniMerge remote-tracking branch 'friendica/master'
2012-03-05 tomtom84Merge pull request #83 from tomtom84/master
2012-03-05 tomtom84Merge pull request #81 from tomtom84/master
2012-03-04 friendicaMerge branch 'pull'
2012-03-04 tomtom84Merge pull request #74 from tomtom84/master
2012-03-03 tomtom84Merge pull request #72 from tomtom84/master
2012-03-03 tomtom84Merge pull request #71 from tomtom84/master
2012-03-03 tomtom84Merge pull request #70 from tomtom84/master
2012-03-03 Simon L'nuMerge branch 'master', remote-tracking branch 'remotes...
2012-03-03 Abinoam P. Marques Jr.Merge pull request #69 from abinoam/docblox
2012-03-03 Abinoam P. Marques JrAdded docblox default configuration file.