diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-01-04 22:54:06 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-04 23:04:42 +0100 |
| commit | 01eaeab56df4da4c697b1096f40a400cc9e2b8e8 (patch) | |
| tree | 6288ee106b4615cacd98362f9fd268317a9cdeff /.buildpacks | |
| parent | 22daf24600d8e99e4569740ee5836d25c70c1e8b (diff) | |
| parent | 2ecc7802caf4d272191a7fd582fc97996f750827 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/application_controller.rb`: Conflict due to theming system. - `app/controllers/oauth/authorizations_controller.rb`: Conflict due to theming system.
Diffstat (limited to '.buildpacks')
0 files changed, 0 insertions, 0 deletions