diff options
| author | azul <azul@riseup.net> | 2017-08-07 08:37:13 +0000 |
|---|---|---|
| committer | azul <azul@riseup.net> | 2017-08-07 08:37:13 +0000 |
| commit | 66b05aa9dc702096d5ce2b75abe7619f780ff8ec (patch) | |
| tree | d6442dbd54d2cf6224714ce2b96643f548148f09 /app/controllers/static_config_controller.rb | |
| parent | 38ce3a14652aca9b3b8d8ad42f9968cfbcc44478 (diff) | |
| parent | 0a161e88143d28349c49805ea7cc83c5106e075a (diff) | |
Merge branch 'fix/token-conflict' into 'master'
prevent token conflicts
Closes #8792
See merge request !42
Diffstat (limited to 'app/controllers/static_config_controller.rb')
0 files changed, 0 insertions, 0 deletions