developers/orbit-basic
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap

Browse Source 
Conflicts:
	config/environments/development.rb
This commit is contained in:
Matt Fu committed 2012-03-01 10:13:49 +08:00
2 parents 819f815023 7c55f6fb88
commit 7f05f21930
63 files changed
+1358 -985
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Gemfile
+1 -1
View File
@@ -22,7 +22,7 @@ gem 'rubyzip'
gem 'sinatra'
gem 'sprockets'
gem 'tinymce-rails'
# gem 'therubyracer'
gem 'therubyracer'