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

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

Browse Source 
Conflicts:
	Gemfile.lock
	app/assets/javascripts/.DS_Store
	app/assets/stylesheets/style.css.erb
	app/views/layouts/_orbit_bar.html.erb
This commit is contained in:
Christophe Vilayphiou committed 2012-06-29 16:10:29 +08:00
2 parents c1c9cca952 7151102a86
commit a1e74987dc
389 files changed
+6931 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.gitignore
+2
View File
@@ -14,3 +14,5 @@ public/assets
config/application.rb
.rvmrc
app/assets/javascripts/.DS_Store