Sebastian McKenzie
|
2f0d0c94ef
|
try alternate merge parameter
|
2015-06-26 20:30:16 +01:00 |
|
Sebastian McKenzie
|
5e3ea5b6e7
|
add update-ref master to merge-development-with-master script
|
2015-06-26 19:48:48 +01:00 |
|
Sebastian McKenzie
|
7da1d9fadd
|
wrap TRAVIS_COMMIT variable in curlies for consistency
|
2015-06-26 16:48:52 +01:00 |
|
Sebastian McKenzie
|
6ab57fd367
|
rebuild website on new version, automatically merge development branch with master - closes #1854, closes #1849
|
2015-06-26 16:46:52 +01:00 |
|