diff options
| author | Azul <azul@leap.se> | 2013-12-23 00:03:11 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2013-12-23 00:03:11 +0100 |
| commit | 5f00ae48047f32f9068281af65fb349a7e79c22d (patch) | |
| tree | 2f6647bad105eae5cd1c8dad44ac77c603d71e8b /config.ru | |
| parent | 4c5851dfac51453571427535419469fe1b73a81d (diff) | |
| parent | a5fa80ca1e20591f25f63d1702a9bc134c60b9ba (diff) | |
Merge remote-tracking branch 'jessib/feature/3389_download_links' into develop
Conflicts:
core/app/views/common/_home_page_buttons.html.haml
users/app/views/users/show.html.haml
Diffstat (limited to 'config.ru')
0 files changed, 0 insertions, 0 deletions