consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'api-dev-PRs' of https://github.com/amiedes/consul into amiedes-api-dev-PRs-2

Browse Source
This commit is contained in:
kikito
2017-06-13 12:07:28 +02:00
parent 0e6c689abe 9ec8b166d7
commit 1701111bf5
35 changed files with 1566 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Gemfile.lock
View File

@@ -176,8 +176,10 @@ GEM
geocoder (1.4.3)
globalid (0.3.7)
activesupport (>= 4.1.0)
graphiql-rails (1.4.1)
rails
graphql (1.5.12)
groupdate (3.2.0)
activesupport (>= 3)
gyoku (1.3.1)
builder (>= 2.1.2)
hashie (3.5.5)
@@ -504,6 +506,8 @@ DEPENDENCIES
foundation-rails (~> 6.2.4.0)
foundation_rails_helper (~> 2.0.0)
fuubar
graphiql-rails (~> 1.4.1)
graphql (~> 1.5.12)
groupdate (~> 3.2.0)
i18n-tasks (~> 0.9.15)
initialjs-rails (= 0.2.0.4)