4 Commits

Author	SHA1	Message	Date
Jim LAURIE	eb1d1645fd	Merge branch 'master' into auth-provider/update-user-models	2018-01-23 10:45:26 +01:00
Satrio Wisnugroho	7f2fcd7c94	Fix missing comma	2018-01-22 10:41:31 +07:00
Jim Laurie	7442e01abb	Fix conflict documentation	2018-01-18 08:32:44 +01:00
acifer	b713866ea1	Update and rename authentification.md to authentication.md	2018-01-15 16:41:42 +01:00