diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-08-18 17:10:26 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-08-18 17:10:26 +0200 |
| commit | 3cc0a4149f263a2a4ccc92673dfb9bcb1afb8bb9 (patch) | |
| tree | bcd131cf9b67f8410838cd74cd32f89cd63363f0 /phpBB/includes/utf | |
| parent | 09f547e373d9dedce138480d4cb883be7c6e2616 (diff) | |
| parent | 78f1e11aeb7e5a471b3a469c43f4cc548fd6ecbe (diff) | |
| download | forums-3cc0a4149f263a2a4ccc92673dfb9bcb1afb8bb9.tar forums-3cc0a4149f263a2a4ccc92673dfb9bcb1afb8bb9.tar.gz forums-3cc0a4149f263a2a4ccc92673dfb9bcb1afb8bb9.tar.bz2 forums-3cc0a4149f263a2a4ccc92673dfb9bcb1afb8bb9.tar.xz forums-3cc0a4149f263a2a4ccc92673dfb9bcb1afb8bb9.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11789] Remove inline color in memberlist_view
Conflicts:
phpBB/styles/subsilver2/template/memberlist_view.html
Diffstat (limited to 'phpBB/includes/utf')
0 files changed, 0 insertions, 0 deletions