Merge branch 'cal_test' of github.com:Rulingcom/orbit into cal_test

Browse Source

Conflicts:
	.gitignore
	vendor/built_in_modules/calendar/app/views/panel/orbitcalendar/back_end/calendar_categories/index.html.erb
	vendor/built_in_modules/calendar/app/views/panel/orbitcalendar/back_end/cals/index.html.erb

...

This commit is contained in:

Christophe Vilayphiou 2012-09-14 00:00:37 +08:00

parent c21e204697 0f265e1534

commit 969d8c8e57

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available