diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-06 01:17:50 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-06 01:17:50 +0400 |
| commit | 47dd9e42f79ba6190d344d1dbf0baa2c348f7239 (patch) | |
| tree | 2bc763f9854a1c55f33ed5345d7c83c5a5a929bb /Gemfile | |
| parent | e142ebde5cb9600f25dd844030318c51dcadb54b (diff) | |
| parent | 47bb945caf22f422ba86a6a91a77bb24ffd01f29 (diff) | |
Merge branch 'raphael-update' of https://github.com/koenpunt/gitlabhq into koenpunt-raphael-update
Conflicts:
Gemfile.lock
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -108,7 +108,7 @@ group :assets do gem "jquery-rails", "2.1.3" gem "jquery-ui-rails", "2.0.2" gem "modernizr", "2.6.2" - gem "raphael-rails", "1.5.2" + gem "raphael-rails", git: "https://github.com/gitlabhq/raphael-rails.git" gem 'bootstrap-sass', "2.2.1.1" gem "font-awesome-sass-rails", "~> 2.0.0" gem "gemoji", "~> 1.2.1", require: 'emoji/railtie' |