diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2018-05-28 12:23:45 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2018-05-28 12:23:45 +0000 |
| commit | 71dea693c61295c16cb9c28c76b1122a3b8a3acf (patch) | |
| tree | 5a93307b78816e6f3cb0b290b7c7dc321f2cea7b /spec/models/event_spec.rb | |
| parent | 8b278829de2ce81b1cc57b9b7001c412a6a38a73 (diff) | |
| parent | 94235cbbcd2af54c462bbcb0e3f7e8c5998c0f2c (diff) | |
| download | gitlab-ce-71dea693c61295c16cb9c28c76b1122a3b8a3acf.tar.gz | |
Merge branch 'leipert-backport-bs4-merge-conflict' into 'master'
Backport of CE->EE merge conflict resolution
See merge request gitlab-org/gitlab-ce!19171
Diffstat (limited to 'spec/models/event_spec.rb')
0 files changed, 0 insertions, 0 deletions