diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-12-25 18:48:15 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-12-25 18:48:15 +0200 |
| commit | f9ece12e872e9bf748f4daebfba88c341d4046f5 (patch) | |
| tree | f2c0bc7ca5ea4b27e9823abf47098d92afc17d67 /log | |
| parent | aadfb3665f39e5886254bac856ebd1cc47f8c652 (diff) | |
| parent | 6428698580d9554983209b6e43c1ce9b201f717d (diff) | |
| download | gitlab-ce-f9ece12e872e9bf748f4daebfba88c341d4046f5.tar.gz | |
Merge branch 'master' into oauth2_provider
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/views/layouts/nav/_profile.html.haml
Diffstat (limited to 'log')
0 files changed, 0 insertions, 0 deletions