2 commits

Author	SHA1	Message	Date
Douwe Maan	41a4785b85	Fix signin with OmniAuth providers	2015-12-08 14:58:15 +01:00
Douwe Maan	843694f902	Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g	2015-08-26 17:53:31 -07:00