Fix bugs after merge

This commit is contained in:
Christophe Vilayphiou committed 2012-09-14 02:27:49 +08:00
1 parent f2a6739fa8
commit 194773f064
3 files changed
+4 -4

No files matched your search

+1
View File
@@ -10,4 +10,5 @@
*= require desktopmain
*= require desktopmedia
*= require orbitTimeline
*= require orbit-bar
*/