Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Gemfile
View file

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

3
Gemfile.lock
View file

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