diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-06-24 14:32:22 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-06-24 14:32:22 +0200 |
| commit | 4b0f27ba7822befed76f8368b472c6ade6977cb2 (patch) | |
| tree | cebf03387c15cb6299d27a7988f78d173d7945de /app/controllers | |
| parent | 03cfe366fd0146cb4c3ede4dcdeeb2228a513e7d (diff) | |
| parent | 50a2854f922ebdd2c056870a0de402329bdf1bb3 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/remote_unfollows_controller.rb (renamed from app/controllers/remote_unfollows.rb) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/app/controllers/remote_unfollows.rb b/app/controllers/remote_unfollows_controller.rb
index af5943363..af5943363 100644
--- a/app/controllers/remote_unfollows.rb
+++ b/app/controllers/remote_unfollows_controller.rb
|