diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-10-16 11:26:48 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-10-16 11:26:48 +0200 |
| commit | 34148d15764898579cc44ea02f439e8359e01233 (patch) | |
| tree | f390aff9f58f2f26fab1c99915c9dd73babe6ea0 /spec/support | |
| parent | 95f0440a7823a927ebba1557b091c12255e49ac4 (diff) | |
| parent | bd3689e9e0aebe43f7c5f787e03a3bbaa8b2ef68 (diff) | |
| download | gitlab-ce-34148d15764898579cc44ea02f439e8359e01233.tar.gz | |
Merge branch 'master' into rs-redactor-filterrs-redactor-filter
Diffstat (limited to 'spec/support')
| -rw-r--r-- | spec/support/test_env.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index 3eab74ba986..d12ba25b71b 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -9,7 +9,7 @@ module TestEnv 'flatten-dir' => 'e56497b', 'feature' => '0b4bc9a', 'feature_conflict' => 'bb5206f', - 'fix' => '12d65c8', + 'fix' => '48f0be4', 'improve/awesome' => '5937ac0', 'markdown' => '0ed8c6c', 'master' => '5937ac0', |