Thibaut Girka 78ac246b87 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
	Gemfile

Solved conflicts by using upstream's line for posix-spawn

2018-05-16 21:52:38 +02:00

..

chewy

…

controllers

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

2018-05-16 21:52:38 +02:00

helpers

Merge branch 'master' into glitch-soc/merge

2018-05-14 20:51:50 +02:00

javascript

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

2018-05-16 21:52:38 +02:00

lib

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

2018-05-16 21:52:38 +02:00

mailers

…

models

Merge branch 'master' into glitch-soc/merge

2018-05-14 20:51:50 +02:00

policies

Merge remote-tracking branch 'origin/master' into gs-master

2018-05-03 17:23:44 -05:00

presenters

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-05-04 18:17:32 +00:00

serializers

Merge branch 'master' into glitch-soc/merge

2018-05-11 18:12:42 +02:00

services

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

2018-05-16 21:52:38 +02:00

validators

Merge remote-tracking branch 'origin/master' into gs-master

2018-05-03 17:23:44 -05:00

views

Merge branch 'master' into glitch-soc/merge

2018-05-14 20:51:50 +02:00

workers

Add REST API for Web Push Notifications subscriptions (#7445)

2018-05-11 11:49:12 +02:00