snipe 8bb3c01f78 Addressed merge issue for reset password for #7997 ...

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

2020-04-30 17:45:05 -07:00

..

assets

Fixed dashboard boxes

2020-04-27 23:05:04 -07:00

lang

Fixed logo uploads

2020-04-27 23:22:52 -07:00

macros

Merge branch 'develop' into integrations/2020-04-15-v5-merge

2020-04-20 23:20:34 -07:00

views

Addressed merge issue for reset password for #7997

2020-04-30 17:45:05 -07:00