diff options
| author | jessib <jessib@leap.se> | 2013-07-09 11:53:58 -0700 | 
|---|---|---|
| committer | jessib <jessib@leap.se> | 2013-07-09 11:53:58 -0700 | 
| commit | 09b7f01cac6df1ae11f4129b20b781b78a3706ac (patch) | |
| tree | 3921eaa5edd03d80e6b402c5c2f88dda6338ab3a /help/leap_web_help.gemspec | |
| parent | 9979b50848ce27730f880159512933e50d5ae0e4 (diff) | |
| parent | 3113f8b814417a896ad5340fda88927733f8ab22 (diff) | |
Merge branch 'master' into feature/authentication_generic_error
Conflicts:
	app/views/layouts/_messages.html.haml
	app/views/layouts/application.html.haml
	users/app/assets/javascripts/users.js.coffee
Diffstat (limited to 'help/leap_web_help.gemspec')
| -rw-r--r-- | help/leap_web_help.gemspec | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/help/leap_web_help.gemspec b/help/leap_web_help.gemspec index 09827dc..4914694 100644 --- a/help/leap_web_help.gemspec +++ b/help/leap_web_help.gemspec @@ -12,7 +12,7 @@ Gem::Specification.new do |s|    s.summary     = "Help Desk for LeapWeb"    s.description = "Managing Tickets for a Leap provider" -  s.files = Dir["{app,config,db,lib}/**/*"] + ["Rakefile", "Readme.md"] +  s.files = Dir["{app,config,db,lib}/**/*"] + ["Rakefile", "README.md"]    s.test_files = Dir["test/**/*"]    s.add_dependency "leap_web_core", LeapWeb::VERSION | 
