diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-01-16 14:20:07 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-01-16 14:20:07 +0100 |
| commit | dbe311f0e97a79f7530c7fe10bcee8b9c70b9904 (patch) | |
| tree | eb42d152d7204d4f109aee195037d82afd842b16 /config/initializers/kaminari_config.rb | |
| parent | 077639c27409f897e87522dd18a51801b6cbc40d (diff) | |
| parent | 5363c724fc33e441cd4be22ba0e757b1ac4fd401 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - config/locales/simple_form.pl.yml
Diffstat (limited to 'config/initializers/kaminari_config.rb')
0 files changed, 0 insertions, 0 deletions