[merge]

2016-01-17 11:48:23 -08:00
parent 76bd8e78cc
commit 5dbe43f42d
581 changed files with 1077 additions and 125423 deletions
@@ -13,6 +13,12 @@ else
 	gem 'lingua_franca', :git => 'git://github.com/lingua-franca/lingua_franca.git'
 end

+#if Dir.exists?('../lingua_franca_commit_and_deploy')
+#	gem 'lingua_franca_commit_and_deploy', :path => '../lingua_franca_commit_and_deploy'
+#else
+#	gem 'lingua_franca_commit_and_deploy', :git => 'git://github.com/lingua-franca/lingua_franca_commit_and_deploy.git'
+#end
+
 gem 'tzinfo-data'
 gem 'sass'#, '~> 3.4.13'
 gem 'sass-rails'