harrybomrah 2d616ab7a8 solved desktop conflict during cherry pick

2013-07-30 16:42:26 +08:00

..

edit.html.erb

solved desktop conflict during cherry pick

2013-07-30 16:42:26 +08:00

index.html.erb

solved desktop conflict during cherry pick

2013-07-30 16:42:26 +08:00

upload.html.erb

update for desktop widgets

2012-11-05 11:40:11 +08:00