diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-10-17 20:17:12 +0300 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-10-17 20:17:12 +0300 |
| commit | a975e4cb34349fb04305d6fb50756adf289ff633 (patch) | |
| tree | 21336a574f911605104b26e85f6f4aa10076471c /spec/support/stub_configuration.rb | |
| parent | 86dcb79be37f5759dfeaa26283ed8bf031b38d54 (diff) | |
| parent | d4feb781387a843586d5a01740c43f50ce7ad084 (diff) | |
Merge branch 'master' into merge-conflicts-editor-2
Diffstat (limited to 'spec/support/stub_configuration.rb')
0 files changed, 0 insertions, 0 deletions