Matt K. Fu 0781779ac0 solved conflicts		2013-04-17 14:14:24 +08:00
..
admin	solved conflicts	2013-04-17 14:14:24 +08:00
default_widget	solved conflicts	2013-04-17 14:14:24 +08:00
desktop	devin's new branch	2013-04-17 14:14:24 +08:00
desktop_widgets	update for desktop widgets	2012-11-05 11:40:11 +08:00
devise	devin's new branch	2013-04-17 14:14:24 +08:00
front	Fix breadcrumb again	2013-02-19 17:50:46 +08:00
js	Integrate Harry's modifications to reload pop-up content	2011-12-29 14:09:06 +08:00
kaminari	Add mobile but remove news in it	2013-01-07 03:03:38 +08:00
layouts	app manager changed plus some changes	2013-04-17 11:09:56 +08:00
mobile	Changes for mobile copyright	2013-02-04 18:02:11 +08:00
shared	Changes in I18n (except personal_conference and personal_journal)	2013-03-12 18:13:48 +08:00