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

Browse Source

Conflicts:
	app/controllers/desktop/journal_pages_controller.rb
	app/models/user/user.rb

...

This commit is contained in:

chris 2012-12-04 00:32:55 +08:00

parent c6e0b56012 f227e55c4f

commit 8d798b14d7

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