Matt K. Fu 0781779ac0 solved conflicts		2013-04-17 14:14:24 +08:00
..
devise.en.yml	…
devise.zh_tw.yml	…
en.yml	solved conflicts	2013-04-17 14:14:24 +08:00
mobile.en.yml	…
mobile.zh_tw.yml	…
mongoid.zh_tw.yml	…
picker.en.yml	…
picker.zh_tw.yml	…
rails.zh_tw.yml	…
social_share_button.en.yml	…
social_share_button.zh-tw.yml	…
zh_tw.yml	solved conflicts	2013-04-17 14:14:24 +08:00