ThibG fce885f271

Merge pull request #1152 from ThibG/glitch-soc/merge-upstream ...

Merge upstream changes

2019-07-07 22:26:10 +02:00

..

chewy

Fix NameError (#11192)

2019-06-27 09:16:55 +02:00

controllers

Merge commit 'c07cca4727041ea5a5721acbc603d4bfb45a15a6' into glitch-soc/merge-upstream

2019-07-07 13:49:31 +02:00

helpers

Merge branch 'master' into glitch-soc/merge-upstream

2019-06-10 18:59:53 +02:00

javascript

[Glitch] Only scroll to the compose form if it's not horizontally in the viewport

2019-07-07 14:03:12 +02:00

lib

Fix support for HTTP proxies (#11245)

2019-07-07 13:53:09 +02:00

mailers

Fix error in AdminMailer#new_pending_account (#10264)

2019-03-14 14:20:22 +01:00

models

Merge commit 'c07cca4727041ea5a5721acbc603d4bfb45a15a6' into glitch-soc/merge-upstream

2019-07-07 13:49:31 +02:00

policies

Merge branch 'master' into glitch-soc/merge-upstream

2019-03-14 17:17:20 +01:00

presenters

Merge branch 'master' into glitch-soc/merge-upstream

2019-04-08 15:57:56 +02:00

serializers

Allow serializing local-only toots in backup service

2019-07-05 21:50:19 +02:00

services

Merge pull request #1152 from ThibG/glitch-soc/merge-upstream

2019-07-07 22:26:10 +02:00

validators

Merge branch 'master' into glitch-soc/merge-upstream

2019-05-19 21:53:44 +02:00

views

Merge branch 'master' into glitch-soc/merge-upstream

2019-06-26 23:19:22 +02:00

workers

Merge branch 'master' into glitch-soc/merge-upstream

2019-07-04 16:21:39 +02:00