diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-09-15 23:40:35 +0300 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-09-15 23:40:35 +0300 |
| commit | e21deaee8ee0d453bf899c1b3fb46262cc60dab9 (patch) | |
| tree | 59b04c9cb1c8ce6c510a78ee787fb31817619835 /Gemfile | |
| parent | 7e2dbcbe0915cfd75e91d78e943c153f284df37d (diff) | |
| parent | 0ad669bb5ba08d012d3daa50b51a3a6b069e3e83 (diff) | |
Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
# Conflicts:
# Gemfile.lock
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -167,7 +167,7 @@ gem "slack-notifier", "~> 1.0.0" gem 'asana', '~> 0.0.6' # FogBugz integration -gem 'ruby-fogbugz' +gem 'ruby-fogbugz', '~> 0.2.0' # d3 gem 'd3_rails', '~> 3.5.5' |