Files
orbit-basic/vendor/built_in_modules/personal_journal
Rueshyna 74900ac048 Merge branch 'desktop_work' into desktop_work_devin
* desktop_work:
  tinyscrollbar minor update
  desktop CSS update

Conflicts:
	vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb
2013-03-05 18:35:17 +08:00
..
2012-09-14 00:05:31 +08:00
2012-09-14 00:05:31 +08:00
2012-09-14 00:05:31 +08:00
2012-09-14 00:05:31 +08:00
2013-02-22 18:21:11 +08:00
2012-09-14 00:05:31 +08:00
2012-09-14 00:05:31 +08:00
2012-09-14 00:05:31 +08:00
2012-09-14 00:05:31 +08:00
2012-09-14 00:05:31 +08:00

= PersonalJournal

This project rocks and uses MIT-LICENSE.