aboutsummaryrefslogtreecommitdiffstats
path: root/git-tools/hooks
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2015-01-29 23:21:59 +0100
committerAndreas Fischer <bantu@phpbb.com>2015-01-29 23:21:59 +0100
commit05d8264de6e7aea7c6f25f0fbd13f5c33f8842c6 (patch)
treec13377bd60355af710edde5342a434a0a4abea6f /git-tools/hooks
parent5b96d305405d6942c4c04f5fbc83c8118c44a3e9 (diff)
parentcc210b1842f8f951dd9578d582fb40f0159cead7 (diff)
downloadforums-05d8264de6e7aea7c6f25f0fbd13f5c33f8842c6.tar
forums-05d8264de6e7aea7c6f25f0fbd13f5c33f8842c6.tar.gz
forums-05d8264de6e7aea7c6f25f0fbd13f5c33f8842c6.tar.bz2
forums-05d8264de6e7aea7c6f25f0fbd13f5c33f8842c6.tar.xz
forums-05d8264de6e7aea7c6f25f0fbd13f5c33f8842c6.zip
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus: [ticket/13554] Show feature release upgrades in blue rather than red. Conflicts: phpBB/adm/style/acp_update.html
Diffstat (limited to 'git-tools/hooks')
0 files changed, 0 insertions, 0 deletions