summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* myVerein views wiederhergestellt.astaf2014-05-084-0/+103
|
* 2014 sowie favicoastaf2014-05-081-0/+0
|
* Merge branch 'master' of ssh://proxy:9044/home/ccwn/git-repos/admin.astaf.deastaf2013-06-253-2/+11
|
* Merge branch 'master' of ssh://proxy:9044/home/ccwn/git-repos/admin.astaf.deastaf2013-06-259-7707/+59
| | | | | Conflicts: protected/runtime/application.log
* Shrottcommitastaf2013-06-251-0/+31
|
* Produktiver standastaf2013-06-206-6/+676
|
* Merge branch 'master' of ssh://proxy:9044/home/ccwn/git-repos/admin.astaf.deastaf2013-05-173-2/+6
|
* Merge branch 'master' of ssh://proxy:9044/home/ccwn/git-repos/admin.astaf.deastaf2013-05-172-3/+4
|
* Merge branch 'master' of ssh://proxy:9044/home/ccwn/git-repos/admin.astaf.deastaf2013-05-152-3/+7
|
* Merge branch 'master' of ssh://proxy:9044/home/ccwn/git-repos/admin.astaf.deastaf2013-05-151-0/+20
|
* Merge branch 'master' of ssh://proxy:9044/home/ccwn/git-repos/admin.astaf.deastaf2012-06-274-8/+38
|
* asdastaf2012-06-271-2/+2
|
* Merge branch 'master' of ssh://proxy:9044/home/ccwn/git-repos/admin.astaf.deastaf2012-06-273-8/+10
|
* Merge branch 'master' of ssh://proxy:9044/home/ccwn/git-repos/admin.astaf.deastaf2012-06-271-1/+1
|
* Merge branch 'master' of ssh://proxy:9044/home/ccwn/git-repos/admin.astaf.deastaf2012-06-262-51/+263
|
* Merge branch 'master' of ssh://proxy:9044/home/ccwn/git-repos/admin.astaf.deastaf2012-06-26376-20/+8109
|
* Local changes on serverastaf2012-06-268-123/+191