Merge branch 'maint' into unstable

Browse Source

Resolved conflicts:
	po/nl.po
The current unstable version was taken as conflict resolution.

...

This commit is contained in:

Geert Janssens 2018-01-25 23:20:03 +01:00

parent 43ad7accda 6aa58811da

commit cd0ce78b9e

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

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

Diff Content Not Available