Christophe Vilayphiou 957d4eaebb Merge branch 'master' into desktop_harry		2012-04-13 16:03:43 +08:00
..
assets	Merge branch 'master' into desktop_harry	2012-04-13 16:03:43 +08:00
controllers	new icons and widgets	2012-04-12 22:18:58 +08:00
helpers	Fix side_bar.	2012-04-12 18:14:00 +08:00
models	Fetching desktop from db	2012-04-11 15:31:10 +08:00
uploaders	Modifications for images in html code	2011-10-18 11:21:24 +08:00
views	Merge branch 'master' into desktop_harry	2012-04-13 16:03:43 +08:00