diff options
| author |   Joas Schilling <nickvergessen@gmx.de> | 2014-11-25 16:47:22 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-11-25 16:47:22 +0100 |
| commit | 1a0cba1099a554323391d7dc43004cbcaaf3ade8 (patch) | |
| tree | 7bf336e4acde626b03a1962d955a96b1070467ca /.gitignore | |
| parent | Merge branch 'develop-ascraeus' into develop (diff) | |
| parent | Merge branch 'prep-release-3.1.2' into develop-ascraeus (diff) | |
| download | phpbb-1a0cba1099a554323391d7dc43004cbcaaf3ade8.tar.gz phpbb-1a0cba1099a554323391d7dc43004cbcaaf3ade8.tar.bz2 phpbb-1a0cba1099a554323391d7dc43004cbcaaf3ade8.zip | |
Merge branch 'develop-ascraeus' into develop
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions