Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

Conflicts: app/api/mobile/api.rb
11 years ago · f29427a2fc
parent f793cff398 7daf01f8e1
commit f29427a2fc
1 changed files with 3 additions and 0 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -96,6 +96,8 @@ GEM
    execjs (2.2.1)
    factory_girl (4.4.0)
      activesupport (>= 3.0.0)
+    faker (1.4.3)
+      i18n (~> 0.5)
    fastercsv (1.5.5)
    ffi (1.9.3)
    ffi (1.9.3-x86-mingw32)
@ -314,6 +316,7 @@ DEPENDENCIES
  coderay (~> 1.0.6)
  coffee-rails (~> 3.2.1)
  factory_girl (~> 4.4.0)
+  faker
  fastercsv (~> 1.5.0)
  grape (~> 0.9.0)
  grape-entity