diff options
| author | James Lopez <james@jameslopez.es> | 2018-03-12 11:45:13 +0100 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2018-03-12 11:45:13 +0100 |
| commit | 7f3e6473ca8e25ee7b860cb6ed6416fc1c98f8b2 (patch) | |
| tree | dd6dbdc0eeb84d6ab3f125d7bd6a6a112ce74c7b /db/schema.rb | |
| parent | 2e3a964a3b45c38716711f2b03de9b6a9d2cfd52 (diff) | |
| parent | a648e950f4a586468b2f8214139c901c3636297f (diff) | |
| download | gitlab-ce-7f3e6473ca8e25ee7b860cb6ed6416fc1c98f8b2.tar.gz | |
Merge branch '10-6-stable' into 10-6-stable-frozen10-6-stable-frozen
# Conflicts:
# locale/gitlab.pot
Diffstat (limited to 'db/schema.rb')
0 files changed, 0 insertions, 0 deletions