Rueshyna d5f1d13670 Merge remote-tracking branch 'origin/desktop_work' into desktop ... * origin/desktop_work: simple layout tinyscrollbar fixed highlighting fixed… fixed adding. layout fix tinyscrollbar_bug fixed url handling modified.. tinyscrollbar modified… star checkbox fixed.. tinyscrollbar fixed some changes for gridster Lot of changes in gridster Conflicts: vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb		2013-03-05 17:34:28 +08:00
..
panel/personal_journal	Merge remote-tracking branch 'origin/desktop_work' into desktop	2013-03-05 17:34:28 +08:00
.gitkeep	Plugins	2012-09-14 00:05:31 +08:00