Merge commit '038315aac56de6869bf418ccb119bf0cad6ed545'

Browse Source

# Conflicts:
#	public/locales/en/translation.json

pull/349/head

Mikael Finstad 6 years ago

parent 444bc02a77 038315aac5

commit cbad13134d

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

Diff Content Not Available