Rueshyna 35e0011111 Merge remote-tracking branch 'remotes/origin/publication' into desktop ... * remotes/origin/publication: new desktop framework updates		2013-01-07 12:44:30 +08:00
..
assets	Merge remote-tracking branch 'remotes/origin/publication' into desktop	2013-01-07 12:44:30 +08:00
controllers	.not_guest_user	2012-12-19 19:48:13 +08:00
helpers	fixed co-author relation bug....	2012-12-06 07:59:42 +08:00
jobs	merge	2012-10-01 21:09:09 +08:00
mailer	Add mail_settings	2012-05-09 11:38:29 +08:00
models	Merge remote-tracking branch 'remotes/origin/publication' into desktop	2013-01-07 12:44:30 +08:00
uploaders	Devin's changes to integrate the store	2012-12-06 23:11:23 +08:00
views	Merge remote-tracking branch 'remotes/origin/publication' into desktop	2013-01-07 12:44:30 +08:00