diff options
author | jessib <jessib@riseup.net> | 2012-10-11 09:47:12 -0700 |
---|---|---|
committer | jessib <jessib@riseup.net> | 2012-10-11 09:47:12 -0700 |
commit | 336d5f786bbd1aaf1847007db64e55f96e585b9d (patch) | |
tree | 0a18244ba8d21ed821c52edb2d44544b5358aa26 /core/lib/leap_web_core.rb | |
parent | cf9ed38ab1840092352efdbb71bfeb5bc3b9f9d5 (diff) | |
parent | 09003d3d2df7c250d3a0b55e83094e5e27094859 (diff) |
Merge branch 'develop' into help_develop
Conflicts:
.gitignore
Diffstat (limited to 'core/lib/leap_web_core.rb')
-rw-r--r-- | core/lib/leap_web_core.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/core/lib/leap_web_core.rb b/core/lib/leap_web_core.rb index 16004f8..8826880 100644 --- a/core/lib/leap_web_core.rb +++ b/core/lib/leap_web_core.rb @@ -1,5 +1,12 @@ +require "rails" + +require "couchrest" +require "couchrest_model" +require "couchrest_session_store" + +require "json" + require "extensions/testing" -require "leap_web_core/dependencies" require "leap_web_core/engine" module LeapWebCore |