diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-11 15:47:23 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-11 15:47:23 +0200 |
| commit | 8d17cf5a70744b3e8cfd4edf57d2924658414604 (patch) | |
| tree | 68aac3d3c5db176c83dec4cfe7c1396baf0ce282 /phpBB/includes/diff | |
| parent | 7ec0289b83e2f3cee4e751e3a0e71ee861cb1332 (diff) | |
| parent | f37ff48e2c1edc643c25db6f213c56de6a27464e (diff) | |
| download | forums-8d17cf5a70744b3e8cfd4edf57d2924658414604.tar forums-8d17cf5a70744b3e8cfd4edf57d2924658414604.tar.gz forums-8d17cf5a70744b3e8cfd4edf57d2924658414604.tar.bz2 forums-8d17cf5a70744b3e8cfd4edf57d2924658414604.tar.xz forums-8d17cf5a70744b3e8cfd4edf57d2924658414604.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12529] Move $phpbb_root_path to the end of the constructor
[ticket/12529] Use root_path in controller\resolver to check the template dir
Diffstat (limited to 'phpBB/includes/diff')
0 files changed, 0 insertions, 0 deletions