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

This commit is contained in:
Martin Edenhofer 2017-03-23 21:31:28 +01:00
commit c6e96f6410
2 changed files with 6 additions and 0 deletions

View file

@ -109,6 +109,9 @@ group :development, :test do
gem 'rack-livereload'
gem 'rb-fsevent', require: false
# auto symlinking
gem 'guard-symlink', require: false
# code QA
gem 'pre-commit'
gem 'rubocop'

View file

@ -153,6 +153,8 @@ GEM
guard (~> 2.8)
guard-compat (~> 1.0)
multi_json (~> 1.8)
guard-symlink (0.1.0)
guard-compat (~> 1.1)
hashdiff (0.3.2)
hashie (3.4.4)
htmlentities (4.3.4)
@ -443,6 +445,7 @@ DEPENDENCIES
github_changelog_generator
guard
guard-livereload
guard-symlink
htmlentities
icalendar
json