diff options
| author | ThibG <thib@sitedethib.com> | 2018-06-24 15:27:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-24 15:27:51 +0200 |
| commit | c18d55e8c25d47a81f99f5ea018d58eecb206a79 (patch) | |
| tree | fe8d33304593499d6c9f87e59a23a51d4d45f9b0 /app/controllers | |
| parent | f364a27922b19efb312959a562a7541cf9d89e97 (diff) | |
| parent | 4b0f27ba7822befed76f8368b472c6ade6977cb2 (diff) | |
Merge pull request #553 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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
|