diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-01-20 18:31:11 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-20 18:31:11 +0100 |
| commit | dc2ab6e646bb721ef2e1be268b876bd00e8fa802 (patch) | |
| tree | a828f3968b151924656061bfc709b00565aff877 /db/migrate/20190715164535_add_instance_actor.rb | |
| parent | eeb8753adc98022a55051d45a137b02a2bff4c23 (diff) | |
| parent | 02063c245c8a2a09e741cbce8302edf3ec14feef (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/packs/public.js`: Upstream removed an unused function in code that has been refactored a bit. Removed that function in the corresponding places.
Diffstat (limited to 'db/migrate/20190715164535_add_instance_actor.rb')
0 files changed, 0 insertions, 0 deletions