Merge branch 'develop' of git.znuny.com:zammad/zammad into develop

Browse source

# Conflicts:
#	.pkgr.yml
#	.travis.yml
#	config/initializers/db_preferences_mysql.rb

...

This commit is contained in:

Martin Edenhofer 2016-10-24 19:39:34 +02:00

parent 29d5136cea 917439316e

commit 81d29db5e7

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