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

Merge branch 'master' into amiedes-api-dev-PRs-2

Browse Source
This commit is contained in:
kikito
2017-06-14 09:58:17 +02:00
parent 430e020a6a e26072b08c
commit 782a68e9d3
39 changed files with 207 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile.lock
View File

@@ -236,7 +236,7 @@ GEM
railties (>= 3.2)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.6.rc1)
mail (2.6.6)
mime-types (>= 1.16, < 4)
mime-types (3.1)
mime-types-data (~> 3.2015)
@@ -555,4 +555,4 @@ DEPENDENCIES
whenever
BUNDLED WITH
1.15.0
1.15.1