Merge branch '3.1.x'

Browse Source

Conflicts:
	phpBB/styles/subsilver2/template/memberlist_body.html

...

This commit is contained in:

Joas Schilling

2015-02-26 22:32:32 +01:00

parent c9df29d680 6647d390b0

commit b75a0d9a11

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available