mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-12-17 09:48:42 +00:00
Merge commit '651e51a82eba542c4d8c3fec5edd16420ea1ff3e' into glitch-soc/merge-upstream
Conflicts: - `yarn.lock`: Upstream updated a dependency textually adjacent to a glitch-soc-specific one. Updated the dependency as upstream did.
This commit is contained in:
@@ -39,6 +39,8 @@ namespace :api, format: false do
|
||||
resource :history, only: :show
|
||||
resource :source, only: :show
|
||||
|
||||
resource :interaction_policy, only: :update
|
||||
|
||||
post :translate, to: 'translations#create'
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user