Merge branch 'add-secure-and-samesite-cookie-flags' into 'develop'

author kaniini <nenolod@gmail.com>

Fri, 7 Sep 2018 23:55:42 +0000 (23:55 +0000)

committer kaniini <nenolod@gmail.com>

Fri, 7 Sep 2018 23:55:42 +0000 (23:55 +0000)
author kaniini <nenolod@gmail.com>
Fri, 7 Sep 2018 23:55:42 +0000 (23:55 +0000)
committer kaniini <nenolod@gmail.com>
Fri, 7 Sep 2018 23:55:42 +0000 (23:55 +0000)
diff --cc config/config.exs
Simple merge
diff --cc lib/pleroma/web/endpoint.ex
Simple merge
author	kaniini <nenolod@gmail.com>
	Fri, 7 Sep 2018 23:55:42 +0000 (23:55 +0000)
committer	kaniini <nenolod@gmail.com>
	Fri, 7 Sep 2018 23:55:42 +0000 (23:55 +0000)
		1	2
config/config.exs	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/endpoint.ex	patch \|	diff1 \|	diff2 \|	blob \| history