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

Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member

Browse Source 
Conflicts:
	app/helpers/attribute_fields_helper.rb
	app/views/admin/infos/_form.html.erb
	config/locales/zh_tw.yml
This commit is contained in:
Matthew K. Fu JuYuan committed 2012-11-16 15:42:39 +08:00
2 parents 3034e53423 b40d4702d5
commit b4a2737407
373 files changed
+10342 -6551
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

spec/models/preview_spec.rb
+5
View File
@@ -0,0 +1,5 @@
require 'spec_helper'
describe Preview do
pending "add some examples to (or delete) #{__FILE__}"
end