diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-12-12 15:40:06 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-12-12 15:40:06 +0100 |
| commit | be4849c08306cce930ea27e1f8097ffb774f75c6 (patch) | |
| tree | 7eb7528245c671cdf908e07c3d630e7639d575bb /app/models/block.rb | |
| parent | 246addd5b33a172600342af3fb6fb5e4c80ad95e (diff) | |
| parent | d08a4979462352f83b1deddaa6209f7b6078ed26 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/application_controller.rb Minor conflict due to glitch-soc's theming system
Diffstat (limited to 'app/models/block.rb')
0 files changed, 0 insertions, 0 deletions