diff options
| author | James Lopez <james@jameslopez.es> | 2016-04-22 15:29:35 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-04-22 15:29:35 +0200 |
| commit | a0ede57dd68e16eb030da388bcfd130eed127494 (patch) | |
| tree | 99ee7fce174b942f86d6277ca8f4787a71438336 /app/controllers/projects_controller.rb | |
| parent | 05edd5e6dc169e4987e5e98e9243fa85c5b6e4b8 (diff) | |
| parent | fedfba55194ed51c6a7510c01fa94091e92c71cf (diff) | |
| parent | 8f973b8f6887da082c4e4c777dc3961fae32ab16 (diff) | |
| download | gitlab-ce-a0ede57dd68e16eb030da388bcfd130eed127494.tar.gz | |
Merge branches 'feature/project-export' and 'feature/project-import' into feature/project-export-ui-experimental