diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-08-02 13:56:30 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-08-02 13:56:30 +0200 |
| commit | dd86615c63db8d2064f403c7b00f23d2d66f167e (patch) | |
| tree | d8b6a8c773a4acec04bae1c61ece31db437b439b /phpBB/phpbb | |
| parent | e0f5a37d81fa20ef2c1c07af1563251680ec1f7e (diff) | |
| parent | c991b1d587e8ab3b080e2e6762646efe00e05bc5 (diff) | |
| download | forums-dd86615c63db8d2064f403c7b00f23d2d66f167e.tar forums-dd86615c63db8d2064f403c7b00f23d2d66f167e.tar.gz forums-dd86615c63db8d2064f403c7b00f23d2d66f167e.tar.bz2 forums-dd86615c63db8d2064f403c7b00f23d2d66f167e.tar.xz forums-dd86615c63db8d2064f403c7b00f23d2d66f167e.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12895] Rename user style setting to resolve conflict with style param
Diffstat (limited to 'phpBB/phpbb')
0 files changed, 0 insertions, 0 deletions