Merge remote-tracking branch 'origin/master'

Browse Source

# Conflicts:
#	README.md
#	lib/group_sql.php

...

This commit is contained in:

Marcin Łojewski

2018-06-13 18:48:20 +02:00

parent d7b1e2f710 00db5f79d4

commit 1028e5f0d6

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