diff options
| author | Nils Adermann <naderman@naderman.de> | 2015-01-19 22:29:38 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2015-01-19 22:29:38 +0100 |
| commit | e4a041fedb976f29ba85357436b55efd4cec6ba7 (patch) | |
| tree | 5fb349afa6df08c2cf0f94cc91be69b900d02e9c /phpBB | |
| parent | ff39ffacf66c40b88c82ed1fff65427c5716e43a (diff) | |
| parent | ebbe6a77918717c9d0897698223c1b783159d67e (diff) | |
| download | forums-e4a041fedb976f29ba85357436b55efd4cec6ba7.tar forums-e4a041fedb976f29ba85357436b55efd4cec6ba7.tar.gz forums-e4a041fedb976f29ba85357436b55efd4cec6ba7.tar.bz2 forums-e4a041fedb976f29ba85357436b55efd4cec6ba7.tar.xz forums-e4a041fedb976f29ba85357436b55efd4cec6ba7.zip | |
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[ticket/10985] Add fix to properly inherit style during update process
Conflicts:
phpBB/includes/bbcode.php
Diffstat (limited to 'phpBB')
0 files changed, 0 insertions, 0 deletions