Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # public/js/dist/bootstrap-table.js # public/mix-manifest.json