diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-25 09:21:45 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-25 09:21:45 -0800 |
| commit | a52529f9b6258b2ae2793930096c3fcbe40078f3 (patch) | |
| tree | fc28baed1a41a50892215c94ccee3f2eddf9772c /app/controllers/files_controller.rb | |
| parent | 7475f4f00d999a603eb01a0b70a966db1cd243d8 (diff) | |
| parent | 56f51bed6b166f12b8b0f4f1bd883142c5e079a6 (diff) | |
| download | gitlab-ce-a52529f9b6258b2ae2793930096c3fcbe40078f3.tar.gz | |
Merge branch 'bitbucket-import'
Conflicts:
app/views/import/gitorious/status.html.haml
db/schema.rb
Diffstat (limited to 'app/controllers/files_controller.rb')
0 files changed, 0 insertions, 0 deletions