Merge develop into 2512_rebase_cleanup

Browse Source

Conflicts:
	include/identity.php

...

This commit is contained in:

rabuzarus

2015-12-25 19:18:12 +01:00

parent 64989781ff c3ae4a03bb

commit ba2517fd71

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