]> git.mxchange.org Git - friendica.git/history - view/theme/diabook/admin_users.tpl
merge
[friendica.git] / view / theme / diabook / admin_users.tpl
2013-03-02 friendicamerge
2012-12-30 Michael VogelMerge remote-tracking branch 'upstream/master'
2012-12-27 friendicaMerge https://github.com/friendica/friendica into pull
2012-12-27 fermionicMerge pull request #565 from fermionic/20121227-elimina...
2012-12-27 Zach Prezkutaremove more dashes in templates
2012-12-03 tobiasdMerge pull request #542 from annando/master
2012-12-03 Michael VogelMerge remote-tracking branch 'upstream/master'
2012-11-29 friendicaMerge https://github.com/friendica/friendica into pull
2012-11-27 Thomas WillinghamMerge branch 'master' of https://github.com/friendica...
2012-11-27 Thomas WillinghamRevert Diabook.
2012-11-04 Thomas WillinghamMerge remote-tracking branch 'upstream/master'
2012-11-03 MichaelMerge remote-tracking branch 'upstream/master'
2012-10-29 FabrixxmMerge remote branch 'friendica/master' into moveme
2012-10-26 friendicaMerge https://github.com/friendica/friendica into pull
2012-10-24 Simon L'nuMerge remote-tracking branch 'remotes/upstream/master'
2012-10-23 Thomas WillinghamDiabook - first part of clean-up to make the theme...
2012-05-19 MichaelMerge branch 'master' of github.com:annando/friendica
2012-05-16 MichaelMerge branch 'master' of github.com:annando/friendica
2012-05-16 friendicaMerge https://github.com/friendica/dir into dpull
2012-05-09 Michael VogelMerge remote branch 'upstream/master'
2012-04-27 Vasudev KamathMerge branch 'master' of git://github.com/friendica...
2012-04-24 Thomas WillinghamMerge remote-tracking branch 'upstream/master'
2012-04-23 zottelMerge remote branch 'upstream/master'
2012-04-23 Simon L'nuMerge branch 'master', remote-tracking branch 'remotes...
2012-04-22 friendicaMerge https://github.com/friendica/friendica into pull
2012-04-22 friendicaMerge pull request #258 from unary/api
2012-04-22 friendicaMerge pull request #257 from CatoTH/master
2012-04-22 tommy tomsondiabook-themes: bugfix
2012-04-21 Michael VogelMerge commit 'upstream/master'
2012-04-20 zottelMerge remote branch 'upstream/master'
2012-04-20 fabrixxmMerge pull request #253 from fabrixxm/master
2012-04-20 Simon L'nuMerge branch 'master', remote-tracking branch 'remotes...
2012-04-20 Fabio ComuniMerge remote-tracking branch 'CatoTH/master' into req245
2012-04-18 Tobias HößlXSRF protection and PHPdoc for mod/admin.php
2012-04-17 friendicaMerge https://github.com/friendica/friendica into pull
2012-04-16 tommy tomsondiabook-themes: small bug/css-fixes ---> ver. 1.019