diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-13 17:14:46 -0500 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-13 17:14:46 -0500 |
commit | 0958f331d1af67514c80f0bc582c93b0ae1ed491 (patch) | |
tree | 512f37d66e349b1b9e6420cf7739aea7ee1ac324 /LICENSE | |
parent | 509654b3784da2a084a0c8303e9c6cc1498b8d2b (diff) | |
parent | d7a28f3c12950d56a187148fda9dce39a9f2bf08 (diff) | |
download | gitlab-ce-0958f331d1af67514c80f0bc582c93b0ae1ed491.tar.gz |
Merge remote-tracking branch 'origin/master' into docker-registry
# Conflicts:
# config/initializers/1_settings.rb
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions