diff options
| author | Azul <azul@riseup.net> | 2017-09-08 09:16:53 +0200 |
|---|---|---|
| committer | Azul <azul@riseup.net> | 2017-09-08 09:16:53 +0200 |
| commit | 35b710c968d6e71e4d4210dbc2e00abc6f14f513 (patch) | |
| tree | ef23e50a234a4a84c8be43b3e91e3ab00fb2a995 /app/controllers/application_controller.rb | |
| parent | c09411e976c3a0fcf2b9c83e16ae06385056fa50 (diff) | |
| parent | d3bf6146d167755afa33fcf2580e46f83064f005 (diff) | |
Merge remote-tracking branch 'origin/master' into master
Diffstat (limited to 'app/controllers/application_controller.rb')
0 files changed, 0 insertions, 0 deletions