Harry Bomrah 366876ae29 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu ... Conflicts: app/assets/stylesheets/lib/orbit_bar/orbit-bar.scss.erb		2015-03-13 17:10:52 +08:00
..
modules	partial widget adding is completed. and some other changes in parser	2014-04-30 18:57:09 +08:00
devise.en.yml	partial widget adding is completed. and some other changes in parser	2014-04-30 18:57:09 +08:00
devise.zh_tw.yml	partial widget adding is completed. and some other changes in parser	2014-04-30 18:57:09 +08:00
en.yml	Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu	2015-03-13 17:10:52 +08:00
mobile.en.yml	partial widget adding is completed. and some other changes in parser	2014-04-30 18:57:09 +08:00
mobile.zh_tw.yml	partial widget adding is completed. and some other changes in parser	2014-04-30 18:57:09 +08:00
mongoid.zh_tw.yml	partial widget adding is completed. and some other changes in parser	2014-04-30 18:57:09 +08:00
new_ui.en.yml	partial widget adding is completed. and some other changes in parser	2014-04-30 18:57:09 +08:00
new_ui.zh_tw.yml	Update category, tag and some translations	2014-05-13 15:07:50 +08:00
picker.en.yml	partial widget adding is completed. and some other changes in parser	2014-04-30 18:57:09 +08:00
picker.zh_tw.yml	partial widget adding is completed. and some other changes in parser	2014-04-30 18:57:09 +08:00
rails.zh_tw.yml	partial widget adding is completed. and some other changes in parser	2014-04-30 18:57:09 +08:00
social_share_button.en.yml	partial widget adding is completed. and some other changes in parser	2014-04-30 18:57:09 +08:00
social_share_button.zh-tw.yml	partial widget adding is completed. and some other changes in parser	2014-04-30 18:57:09 +08:00
zh_tw.yml	Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu	2015-03-13 17:10:52 +08:00