Maikel Linke 2053fbecda Merge branch 'i18n-replace-strings-in-js' into i18n ...

Conflicts:
	.travis.yml
	app/views/spree/order_mailer/confirm_email_for_customer.html.haml
	config/locales/en.yml

2015-10-21 14:09:43 +11:00

..

includes.sh

CI scripts use env vars

2015-10-21 10:04:29 +11:00

load_staging_baseline.sh

CI scripts use env vars

2015-10-21 10:04:29 +11:00

merge_branch_to_master.sh

CI: Add more robust merge-to-master script

2015-06-03 12:25:28 +10:00

merge_master_into_branch.sh

Store commit at start of build process and use it throughout

2015-06-17 16:25:34 +10:00

push_to_production.sh

CI scripts use env vars

2015-10-21 10:04:29 +11:00

push_to_staging.sh

CI scripts use env vars

2015-10-21 10:04:29 +11:00

run_js_tests.sh

Store commit at start of build process and use it throughout

2015-06-17 16:25:34 +10:00

run_tests.sh

clearing tmp cache with rake

2015-10-08 18:08:21 +11:00

save_staging_baseline.sh

CI scripts use env vars

2015-10-21 10:04:29 +11:00