James Edwards-Jones b988faaf85 Merge branch 'master' into 'jej-pages-to-ce' ... # Conflicts: # db/schema.rb		2017-02-06 15:12:27 +00:00
..
account	Merge the two 2FA docs into one	2017-01-24 15:49:08 +01:00
admin_area	Reduce size of images from 25MB to 13MB using pngquant	2016-11-22 19:53:43 +01:00
img	Reduce size of images from 25MB to 13MB using pngquant	2016-11-22 19:53:43 +01:00
profile/account	Merge branch 'improve-two_factor_authentication-doc' into 'master'	2017-01-26 16:50:53 +00:00
project	Merge branch 'master' into 'jej-pages-to-ce'	2017-02-06 15:12:27 +00:00
markdown.md	fix nested tasks in ordered list	2017-01-24 15:08:16 +01:00
permissions.md	Fix pages abilities	2017-01-31 22:55:28 +00:00