snipe 0000f487ac Merge remote-tracking branch 'origin/fixes/password_confirmation_6703' into develop ... # Conflicts: # config/version.php		2019-02-13 23:02:21 -08:00
..
admin	Merge branch 'develop' into dev-master-integration	2019-02-13 06:42:52 -08:00
auth	Use username instead of email address in password reset (#6382)	2018-10-31 18:03:24 -07:00
button.php	Fixed #4301 - added image upload to audit	2018-04-24 02:54:54 -07:00
general.php	Updated language string to include XML	2018-12-12 17:46:19 -08:00
help.php	More help text updates	2018-10-04 21:14:45 -07:00
mail.php	Features/nicer notifications (#5886)	2018-07-18 19:15:45 -07:00
pagination.php	Updated translation strings with new purge text	2016-04-19 12:26:49 -07:00
passwords.php	Use username instead of email address in password reset (#6382)	2018-10-31 18:03:24 -07:00
reminders.php	Updated translation strings with new purge text	2016-04-19 12:26:49 -07:00
table.php	Updated translation strings with new purge text	2016-04-19 12:26:49 -07:00
validation.php	Fixed #6703 - fixes password confirmation	2019-02-13 21:30:15 -08:00