[issue #279] Merge branch '279-new_design_for_platforms' of github.com:warpc/rosa-build into 279-new_design_for_platforms

Browse Source

Conflicts:
	config/locales/models/platform.ru.yml

...

This commit is contained in:

George Vinogradov 2012-03-20 20:27:19 +04:00

parent 7c0585ee87 b6b1462de5

commit 6867e87f0c

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