git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
Nweni
2017-06-06 11:08:51 +06:30
parent c461cb94f2 dcb8217824
commit c2952c4600
6 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile.lock
View File

@@ -92,6 +92,8 @@ GEM
railties (>= 3.2, < 5.2)
globalid (0.4.0)
activesupport (>= 4.2.0)
httparty (0.15.5)
multi_xml (>= 0.5.2)
i18n (0.8.4)
jbuilder (2.6.4)
activesupport (>= 3.0.0)
@@ -114,6 +116,7 @@ GEM
mini_portile2 (2.1.0)
minitest (5.10.2)
multi_json (1.12.1)
multi_xml (0.6.0)
mysql2 (0.4.6)
nio4r (2.1.0)
nokogiri (1.7.2)
@@ -248,6 +251,7 @@ DEPENDENCIES
factory_girl_rails (~> 4.0)
faker
font-awesome-rails
httparty (~> 0.15.5)
jbuilder (~> 2.5)
jquery-rails
kaminari!