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

merged origami

Browse Source
This commit is contained in:
Yan
2017-06-01 10:08:55 +06:30
parent 82d7d7ffcc 47469cf466
commit 6b2a496830
7 changed files with 144 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile.lock
View File

@@ -96,12 +96,8 @@ GEM
mini_portile2 (2.1.0)
minitest (5.10.2)
multi_json (1.12.1)
<<<<<<< HEAD
nio4r (2.1.0)
=======
mysql2 (0.4.6)
nio4r (2.0.0)
>>>>>>> f036274f5e32e3447277b99e21bc166a621a9dcf
nokogiri (1.7.2)
mini_portile2 (~> 2.1.0)
pdf-core (0.7.0)