snipe b9bab05ac3 Merge branch 'master' of https://github.com/ajsy/snipe-it into ajsy-master ...

Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	resources/views/users/print.blade.php

2021-04-05 20:55:49 -07:00

..

admin

Merge branch 'master' of https://github.com/ajsy/snipe-it into ajsy-master

2021-04-05 20:55:49 -07:00

auth

Nicer formatting of the page if custom logout [ch15660]

2021-02-03 14:56:26 -08:00

button.php

Revert "Updated translations"

2020-10-08 18:43:06 -07:00

general.php

Added better visual cues for login (#9051)

2021-01-26 19:57:39 -08:00

help.php

More help text updates

2018-10-04 21:14:45 -07:00

mail.php

Fixed weird parsing in newer markdown

2020-12-08 20:04:01 -08:00

pagination.php

Updated translation strings with new purge text

2016-04-19 12:26:49 -07:00

passwords.php

Updated translations with latest from CrowdIn

2020-11-09 14:52:11 -08: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 #8926, #8252 - introduce circular reference check for location parent_id - rebased from #8253 (#8927)

2020-12-18 17:18:04 -08:00