aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Etienne2012-09-25 15:55:37 +0200
committerMichel Etienne2012-09-25 15:55:37 +0200
commit05f1787884429c5756f445e32dba92e65657b5ef (patch)
treeea0f755bd28b0a68fdad573895212dd1a71f1e74
parent42ce765c5d4fec2f33453fca90862ec647770e86 (diff)
downloadchouette-core-05f1787884429c5756f445e32dba92e65657b5ef.tar.bz2
synchro user_interface
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock2
2 files changed, 2 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index ff0b9a92c..a7f6b8a5f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -40,6 +40,7 @@ gem 'gravatar_image_tag'
gem "acts_as_tree", :git => "git://github.com/dryade/acts_as_tree.git"
#gem 'ninoxe', :git => 'git://github.com/dryade/ninoxe.git'
+#gem 'ninoxe', :git => 'git://github.com/dryade/ninoxe.git', :branch => 'V2_0_0'
gem 'ninoxe', :git => 'git://chouette.dryade.priv/ninoxe' #, :path => '~/Projects/Ninoxe'
gem 'acts_as_list', '0.1.6'
diff --git a/Gemfile.lock b/Gemfile.lock
index 03ad2fb8d..bf47b3283 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -61,7 +61,7 @@ GIT
GIT
remote: git://sim.dryade.priv/user_interface
- revision: 0fac5e33ba61eaa691a65d9a5f49f6acd3755927
+ revision: d828d7107f2b4025853cbfa7cc0e76cceca27da6
specs:
user_interface (0.0.1)
rails (> 3.1.0)