Lunny Xiao 9e865cee67 Merge password and 2fa page on user settings (#2695) ... * merge password and 2fa page on user settings		2017-10-16 11:14:12 +02:00
..
gitignore	Synced gitignores with github repo (#1245)	2017-03-15 13:30:00 +01:00
label	Bindata is optional and over-writable on restart (#354)	2016-12-22 19:12:23 +01:00
license	Synced licenses with github repo (#1246)	2017-03-15 13:30:16 +01:00
locale	Merge password and 2fa page on user settings (#2695)	2017-10-16 11:14:12 +02:00
readme	Bindata is optional and over-writable on restart (#354)	2016-12-22 19:12:23 +01:00