snipe 407445456a Merge branch 'features/6204_email_audit-alerts' into develop ... # Conflicts: # app/Console/Commands/LdapSync.php # app/Console/Kernel.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/LicensesController.php # composer.json # composer.lock # config/version.php # resources/views/auth/two_factor_enroll.blade.php		2019-05-06 08:45:13 -04:00
..
admin	Removed help text for email images (since we embed them by default now)	2019-04-02 18:22:31 -07:00
auth	Horrible master -> dev merge that makes baby jesus cry :(	2019-03-20 02:24:23 -07:00
button.php	Fixed #4301 - added image upload to audit	2018-04-24 02:54:54 -07:00
general.php	Merge branch 'features/6204_email_audit-alerts' into develop	2019-05-06 08:45:13 -04:00
help.php	More help text updates	2018-10-04 21:14:45 -07:00
mail.php	Added upcoming audit report	2019-05-04 17:52:17 -04: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	Fix #6763. Import Stuck Processing - Error - Can only flip STRING and INTEGER values! (#6804)	2019-03-14 12:32:40 -07:00