Merge branch 'develop' of github.com:zammad/zammad into develop

Browse source

# Conflicts:
#	app/assets/stylesheets/print.scss

...

This commit is contained in:

Martin Edenhofer 2018-09-02 13:18:24 +02:00

parent 752a65e9ba a370d01e29

commit 9e124593b6

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 is not available