Marin Jankovski 36a9e47d70 Merge remote-tracking branch 'CE/master' into merge_ce_rc1 ...

Conflicts:
	Gemfile.lock
	VERSION
	doc/README.md
	doc/install/installation.md

2014-09-17 18:36:14 +02:00

..

branded_login_page

Move the branded login page documentation to customization directory.

2014-06-18 11:51:44 +02:00

branded_login_page.md

Move the branded login page documentation to customization directory.

2014-06-18 11:51:44 +02:00

welcome_message.md

Document the extra.sign_in_text setting for CE

2014-08-20 11:56:52 +02:00