]> git.mxchange.org Git - admin.git/commitdiff
projects / admin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 034eb1f d13b1cd)
Merge branch 'master' of git.mxchange.org:/var/cache/git/repos/admin
authorRoland Haeder <roland@mxchange.org>
Mon, 11 May 2015 12:04:50 +0000 (14:04 +0200)
committerRoland Haeder <roland@mxchange.org>
Mon, 11 May 2015 12:04:50 +0000 (14:04 +0200)
Signed-off-by: Roland Haeder <roland@mxchange.org>
Conflicts:
core

1  2 
index.php patch | diff1 | diff2 | blob | history

diff --cc index.php
Simple merge
Generic Administration area for projects based on 'core' framework.