Dane Everitt 6419b1cf81 Handle password reset logic change for 2fa		2018-07-04 18:11:43 -07:00
..
assets	Handle password reset logic change for 2fa	2018-07-04 18:11:43 -07:00
lang	Merge branch 'develop' into feature/vuejs	2018-07-02 21:00:42 -07:00
themes/pterodactyl	Merge branch 'develop' into feature/vuejs	2018-07-02 21:00:42 -07:00