Merge branch 'develop-ascraeus' into develop

Browse Source

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

...

This commit is contained in:

Marc Alexander

2015-02-15 18:52:05 +01:00

parent e5104b5d53 088907fe8e

commit 2042bfc5db

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