Merge branch '230-registration_page' of github.com:warpc/rosa-build into 230-registration_page

Browse Source

Conflicts:
	config/locales/en.yml
	config/locales/ru.yml

...

This commit is contained in:

Alexander Machehin 2012-02-29 23:08:41 +06:00

parent ba4fae071f b759e2b065

commit 4f6876aa34

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