434 commits

Author	SHA1	Message	Date
snipe	615bdd0499	Bumped hash ... Signed-off-by: snipe <snipe@snipe.net>	2021-07-15 13:29:07 -07:00
snipe	5b5b70e639	Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/version.php # public/js/build/app.js # public/js/dist/all.js # public/mix-manifest.json	2021-06-28 11:01:45 -07:00
snipe	6521f16b80	Bumped version ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-28 11:00:34 -07:00
snipe	2e6bac7db5	Bumped version ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-23 18:36:43 -07:00
snipe	335f4e50a5	Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/version.php	2021-06-23 16:07:01 -07:00
snipe	1808986bf5	Bumped version ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-23 16:06:30 -07:00
snipe	a67ce965ec	Update version.php	2021-06-22 20:13:03 -07:00
snipe	aae6a8fc6c	Bumped version ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-10 17:42:29 -07:00
snipe	7d5a9180e6	Updated hash ... Signed-off-by: snipe <snipe@snipe.net>	2021-05-26 15:57:56 -07:00
snipe	aa98e4ea7a	Bumped hash ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/version.php	2021-05-05 00:04:17 -07:00
snipe	6935d94184	Bumped hash ... Signed-off-by: snipe <snipe@snipe.net>	2021-05-05 00:03:33 -07:00
snipe	a1bc984d17	Generate production assets, bumped version ... Signed-off-by: snipe <snipe@snipe.net>	2021-04-26 17:34:02 -07:00
snipe	31944cd4d4	Bumped version ... Signed-off-by: snipe <snipe@snipe.net>	2021-04-26 17:28:38 -07:00
snipe	b2a3a80f96	Bumped hash ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # composer.lock # config/version.php	2021-03-17 20:04:43 -07:00
snipe	afb7fcfa3e	Bumped hash ... Signed-off-by: snipe <snipe@snipe.net>	2021-03-17 20:02:54 -07:00
snipe	0fa07a4bca	Bumped point version	2021-03-09 16:19:21 -08:00
snipe	fcd805638e	Changed branch from develop to master	2021-02-25 16:54:23 -08:00
snipe	6373ef3283	Bumped version	2021-02-25 16:53:37 -08:00
snipe	a5731a3088	Updated hash	2021-02-19 10:09:22 -08:00
snipe	681c41bd18	Bumped version	2021-02-05 14:28:31 -08:00
snipe	fdde844ce5	Bumped version to 5.1.0	2021-02-02 21:48:42 -08:00
snipe	f871759753	Bumped version to 5.0.13-pre	2021-01-26 20:08:44 -08:00
snipe	8e17818f1e	Bumped version to 5.0.13-pre	2021-01-26 20:08:08 -08:00
snipe	eb423c252a	Merge remote-tracking branch 'origin/develop' ... # Conflicts: # config/version.php	2021-01-04 09:09:39 -08:00
snipe	4a5cb94d94	Switch version file back to develop	2020-12-14 17:47:02 -08:00
Alexander Chibrikin	fb37dbed92	use supported package for slack (#8867) ... * Updated version.php to master * use supported package for slack Co-authored-by: snipe <snipe@snipe.net>	2020-12-14 17:45:00 -08:00
snipe	adc0d3a6ac	Merge remote-tracking branch 'origin/develop' ... # Conflicts: # config/version.php	2020-12-08 16:53:43 -08:00
snipe	8b15841c4b	Bumped version	2020-12-07 19:16:42 -08:00
snipe	60d269afb5	Merge remote-tracking branch 'origin/develop' ... # Conflicts: # config/version.php	2020-11-30 17:28:46 -08:00
snipe	e2cb7a0242	Bumped version	2020-11-30 17:28:03 -08:00
snipe	74b26a349c	Merge remote-tracking branch 'origin/develop' ... # Conflicts: # config/version.php	2020-11-24 13:54:02 -08:00
snipe	e9bfb157bb	Bumped version. Again.	2020-11-24 13:53:28 -08:00
snipe	02fef7049f	Merge remote-tracking branch 'origin/develop' ... # Conflicts: # config/version.php	2020-11-24 12:17:38 -08:00
snipe	712363f861	Bumped version	2020-11-23 12:33:07 -08:00
snipe	e5f0a12c25	Updated version.php to master	2020-11-17 00:14:28 -08:00
snipe	3237411b5d	Bumped version	2020-11-16 23:57:17 -08:00
snipe	58c476195b	Bumped hash	2020-11-13 14:14:27 -08:00
snipe	dcd98a7bf1	Bumped hash	2020-11-13 14:13:44 -08:00
snipe	2aa9412565	Bumped version ... # Conflicts: # config/version.php	2020-11-09 23:09:46 -08:00
snipe	35ab5c7df0	Bumped version	2020-11-09 23:09:10 -08:00
snipe	b59269d5e2	Bumped version	2020-11-09 21:46:42 -08:00
snipe	8bbf8409b1	Bumped hash	2020-11-09 21:46:08 -08:00
snipe	d76eea53c4	Bumped hash	2020-11-09 19:45:27 -08:00
snipe	9f4a212b44	Bumped hash	2020-11-03 11:47:58 -08:00
snipe	2844800caf	Merge remote-tracking branch 'origin/develop' ... # Conflicts: # config/version.php	2020-10-26 14:26:05 -07:00
snipe	7937258f6e	Bumped version	2020-10-26 14:24:19 -07:00
snipe	79a4acae1a	Merge remote-tracking branch 'origin/develop' ... # Conflicts: # config/version.php	2020-10-23 14:29:40 -07:00
snipe	91e0b26bbb	Bumped version	2020-10-23 14:28:55 -07:00
snipe	f182ce1c89	Merge remote-tracking branch 'origin/develop' ... # Conflicts: # config/version.php	2020-10-23 01:12:54 -07:00
snipe	c6dde67e86	Bumped version	2020-10-23 01:12:19 -07:00
snipe	810f6a3970	Merge remote-tracking branch 'origin/develop' ... # Conflicts: # config/version.php	2020-10-21 12:03:23 -07:00
snipe	33236f16ac	Bumped minor version	2020-10-21 12:01:36 -07:00
snipe	870b097f03	Derp. Should be master	2020-10-19 17:49:56 -07:00
snipe	a62e8413ba	Updated version	2020-10-19 16:36:25 -07:00
snipe	2dc027e479	Bumped GM version	2020-10-09 17:29:31 -07:00
snipe	4dbf1f58e3	Bumped RC to GM	2020-10-06 19:11:34 -07:00
snipe	b0e9875a50	Counting is hard. :(	2020-09-24 14:20:29 -07:00
snipe	7314bc4c4e	Bumped hash for newest RC	2020-09-24 14:19:34 -07:00
Bennett Blodinger	83dfa2a28c	Merge branch 'develop' into gmaps-8465	2020-09-22 17:41:38 -05:00
snipe	b9e19468e5	Bumped version for v4.9.5	2020-09-15 18:43:19 -07:00
snipe	426897c902	Bumped hash	2020-09-15 10:13:55 -07:00
snipe	24a52eaeae	Bumped hash	2020-09-12 10:04:36 -07:00
snipe	daf748e531	Bumped hash	2020-07-17 12:32:01 -07:00
snipe	ec6ed256fb	Bumped minor version	2020-07-06 18:45:43 -07:00
snipe	af06e42056	Bumped version	2020-06-17 11:17:25 -07:00
snipe	87464e6ec0	Merge branch 'develop' into integrations/2020-04-15-v5-merge ... # Conflicts: # README.md # app/Http/Controllers/AccessoriesController.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/LicensesController.php # app/Http/Controllers/Api/LocationsController.php # app/Http/Controllers/Api/SettingsController.php # app/Http/Controllers/Api/UsersController.php # app/Http/Controllers/AssetModelsController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Auth/ForgotPasswordController.php # app/Http/Controllers/CategoriesController.php # app/Http/Controllers/CompaniesController.php # app/Http/Controllers/ComponentsController.php # app/Http/Controllers/ConsumablesController.php # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/DepartmentsController.php # app/Http/Controllers/LicensesController.php # app/Http/Controllers/LocationsController.php # app/Http/Controllers/ManufacturersController.php # app/Http/Controllers/SettingsController.php # app/Http/Controllers/SuppliersController.php # app/Http/Controllers/UsersController.php # app/Http/Requests/AssetRequest.php # app/Http/Requests/ImageUploadRequest.php # app/Models/LicenseSeat.php # app/Models/Location.php # app/Models/Setting.php # composer.json # composer.lock # config/database.php # config/version.php # npm-shrinkwrap.json # package.json # public/css/AdminLTE.css # public/css/AdminLTE.css.map # public/css/overrides.css # public/css/overrides.css.map # public/css/skins/skin-blue-light.css # public/css/skins/skin-blue.css # public/css/skins/skin-green-dark.min.css # public/js/app.js # public/js/bootstrap-table.js # public/js/bootstrap/js/bootstrap.js # public/js/bootstrap/js/bootstrap.min.js # public/js/build/all.js # public/js/build/vue.js # public/js/build/vue.js.map # public/js/demo.js # public/js/ekko-lightbox.js # public/js/ekko-lightbox.min.js # public/js/extensions/export/bootstrap-table-export.js # public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.js # public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js # public/js/extensions/toolbar/bootstrap-table-toolbar.min.js # public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js # public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js # public/js/plugins/timepicker/bootstrap-timepicker.js # public/js/plugins/timepicker/bootstrap-timepicker.min.js # public/js/vue.js # public/mix-manifest.json # resources/assets/js/bootstrap-js.js # resources/assets/js/bootstrap.min.js # resources/assets/js/ekko-lightbox.js # resources/assets/js/ekko-lightbox.min.js # resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js # resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js # resources/assets/js/plugins/chartjs/Chart.js # resources/assets/js/plugins/timepicker/bootstrap-timepicker.js # resources/assets/js/plugins/timepicker/bootstrap-timepicker.min.js # resources/assets/less/AdminLTE.less # resources/assets/less/overrides.less # resources/assets/less/skins/_all-skins.less # resources/assets/less/skins/skin-black.less # resources/assets/less/skins/skin-blue.less # resources/assets/less/skins/skin-green.less # resources/assets/less/skins/skin-purple.less # resources/assets/less/skins/skin-red.less # resources/assets/less/skins/skin-yellow.less # resources/assets/less/variables.less # resources/js/components/importer/importer-file.vue # resources/lang/en/auth/message.php # resources/lang/en/passwords.php # resources/lang/es-CO/general.php # resources/lang/es-ES/general.php # resources/lang/es-VE/general.php # resources/less/skins/skin-black-dark.less # resources/less/skins/skin-blue-dark.less # resources/less/skins/skin-contrast.less # resources/less/skins/skin-green-dark.less # resources/less/skins/skin-orange-dark.less # resources/less/skins/skin-orange.less # resources/less/skins/skin-purple-dark.less # resources/less/skins/skin-red-dark.less # resources/less/skins/skin-yellow-dark.less # resources/views/accessories/checkin.blade.php # resources/views/accessories/checkout.blade.php # resources/views/accessories/edit.blade.php # resources/views/account/profile.blade.php # resources/views/account/view-assets.blade.php # resources/views/asset_maintenances/edit.blade.php # resources/views/auth/passwords/email.blade.php # resources/views/auth/passwords/reset.blade.php # resources/views/categories/edit.blade.php # resources/views/companies/edit.blade.php # resources/views/components/checkin.blade.php # resources/views/components/checkout.blade.php # resources/views/components/edit.blade.php # resources/views/consumables/checkout.blade.php # resources/views/consumables/edit.blade.php # resources/views/custom_fields/fields/edit.blade.php # resources/views/custom_fields/fieldsets/edit.blade.php # resources/views/dashboard.blade.php # resources/views/departments/edit.blade.php # resources/views/groups/edit.blade.php # resources/views/hardware/audit.blade.php # resources/views/hardware/bulk-checkout.blade.php # resources/views/hardware/bulk.blade.php # resources/views/hardware/checkin.blade.php # resources/views/hardware/checkout.blade.php # resources/views/hardware/edit.blade.php # resources/views/hardware/index.blade.php # resources/views/hardware/quickscan.blade.php # resources/views/hardware/view.blade.php # resources/views/importer/import.blade.php # resources/views/layouts/basic.blade.php # resources/views/layouts/default.blade.php # resources/views/layouts/edit-form.blade.php # resources/views/licenses/checkin.blade.php # resources/views/licenses/checkout.blade.php # resources/views/licenses/edit.blade.php # resources/views/locations/edit.blade.php # resources/views/manufacturers/edit.blade.php # resources/views/modals/upload-file.blade.php # resources/views/models/bulk-edit.blade.php # resources/views/models/custom_fields_form.blade.php # resources/views/models/edit.blade.php # resources/views/partials/bootstrap-table.blade.php # resources/views/partials/forms/edit/address.blade.php # resources/views/partials/forms/edit/asset-select.blade.php # resources/views/partials/forms/edit/category-select.blade.php # resources/views/partials/forms/edit/category.blade.php # resources/views/partials/forms/edit/company-select.blade.php # resources/views/partials/forms/edit/company.blade.php # resources/views/partials/forms/edit/department-select.blade.php # resources/views/partials/forms/edit/depreciation.blade.php # resources/views/partials/forms/edit/email.blade.php # resources/views/partials/forms/edit/image-upload.blade.php # resources/views/partials/forms/edit/item_number.blade.php # resources/views/partials/forms/edit/location-profile-select.blade.php # resources/views/partials/forms/edit/location-select.blade.php # resources/views/partials/forms/edit/location.blade.php # resources/views/partials/forms/edit/maintenance_type.blade.php # resources/views/partials/forms/edit/manufacturer-select.blade.php # resources/views/partials/forms/edit/manufacturer.blade.php # resources/views/partials/forms/edit/minimum_quantity.blade.php # resources/views/partials/forms/edit/model-select.blade.php # resources/views/partials/forms/edit/model_number.blade.php # resources/views/partials/forms/edit/name.blade.php # resources/views/partials/forms/edit/notes.blade.php # resources/views/partials/forms/edit/order_number.blade.php # resources/views/partials/forms/edit/phone.blade.php # resources/views/partials/forms/edit/purchase_cost.blade.php # resources/views/partials/forms/edit/purchase_date.blade.php # resources/views/partials/forms/edit/quantity.blade.php # resources/views/partials/forms/edit/serial.blade.php # resources/views/partials/forms/edit/status.blade.php # resources/views/partials/forms/edit/submit.blade.php # resources/views/partials/forms/edit/supplier-select.blade.php # resources/views/partials/forms/edit/supplier.blade.php # resources/views/partials/forms/edit/user-select.blade.php # resources/views/reports/custom.blade.php # resources/views/settings/alerts.blade.php # resources/views/settings/asset_tags.blade.php # resources/views/settings/barcodes.blade.php # resources/views/settings/branding.blade.php # resources/views/settings/general.blade.php # resources/views/settings/labels.blade.php # resources/views/settings/ldap.blade.php # resources/views/settings/localization.blade.php # resources/views/settings/security.blade.php # resources/views/setup/user.blade.php # resources/views/suppliers/edit.blade.php # resources/views/users/bulk-edit.blade.php # resources/views/users/edit.blade.php # resources/views/users/ldap.blade.php # resources/views/users/print.blade.php # resources/views/users/view.blade.php # routes/api.php # routes/web/hardware.php # webpack.mix.js	2020-04-20 23:20:34 -07:00
snipe	48dfc699d7	Bumped version	2020-04-09 10:49:50 -07:00
snipe	be3e572440	Bumped version	2020-04-08 11:24:30 -07:00
snipe	be79a1f3d6	Bumped hash	2020-04-02 19:27:41 -07:00
snipe	a2fae76eaf	Bumped version	2020-03-04 22:37:17 -08:00
snipe	5ef40340fb	Bumped version	2019-12-11 19:38:04 -08:00
snipe	91bb76fd8a	Bumped version	2019-12-06 13:05:20 -08:00
snipe	70c8ad9797	Bumped minor version	2019-10-28 13:55:21 -07:00
snipe	4159a0effa	Bumped version	2019-09-03 14:12:13 -07:00
snipe	c7be25078e	Bumped version	2019-07-26 13:02:47 -07:00
snipe	a0f3fc6d76	Bumped hash	2019-07-18 14:37:54 -07:00
snipe	61fb38087e	Bumped hash	2019-07-17 17:55:53 -07:00
snipe	d19df4ded8	Bumped version	2019-06-24 14:43:44 -07:00
snipe	765417c0be	Bumped point version	2019-05-31 14:17:26 -07:00
snipe	925d3a23c6	Bumped hash	2019-05-31 13:11:07 -07:00
snipe	b07a254e60	Bumped version	2019-05-29 15:51:54 -07:00
snipe	db76090e10	Missed one	2019-05-28 19:12:53 -07:00
snipe	03cf3b5431	Bumped release again :(	2019-05-28 19:12:42 -07:00
snipe	7aa6ef5f6c	Bumped version	2019-05-28 19:08:35 -07:00
snipe	6f2717a876	Updated branch in version file	2019-05-28 13:22:59 -07:00
snipe	79156ff8f4	Bumped version	2019-05-23 17:10:47 -07:00
snipe	7b34cf1a31	Bumped version	2019-05-21 19:17:56 -07:00
snipe	33b59d7bed	Bumped version	2019-05-15 16:45:07 -07:00
snipe	e5c2d77c7d	Fixes #6204 - added email alerts and web/API access to assets due for audits (#6992) ... * Added upcoming audit report TODO: Fid diff/threshold math * Added route to list overdue / upcoming assets via API * Controller/API methods for due/overdue audits We could probably skip this and just handle it via view in the routes… * Added query scopes for due and overdue audits * Added audit due console command to kernel * Added ability to pass audit specs to main API asset search method * Added audit presenter * Added bootstrap-tables presenter formatter to display an audit button * Added gated sidenav items to left nav * Added audit due/overdue blades * Cleanup on audit due/overdue console command * Added language strings for audit views * Fixed :threshold placeholder * Removed unused setting variable * Fixed next audit date math * Added scope for both overdue and upcoming * Derp. Wrong version * Bumped version (I will release this version officially tomorrow)	2019-05-05 22:32:52 -04:00
snipe	25884a893e	Bumped version	2019-03-20 02:41:33 -07:00
snipe	d429a1c423	Bumped version	2019-03-20 02:32:32 -07:00
snipe	b6da68a69c	Bumped version	2019-03-18 20:50:47 -07:00
snipe	c211cc733c	Bumped hash	2019-03-05 21:26:24 -08:00
snipe	53db96edad	Bumped minor version	2019-02-22 13:24:45 -08:00
snipe	1573e2a91f	Bumped hash	2019-02-20 20:52:08 -08:00
snipe	e2834fab90	Bumped minor version	2019-02-16 11:48:20 -08:00
snipe	6256abddf2	Bumped point release	2019-02-14 15:07:11 -08:00
snipe	9035707bd6	Bumped point version	2019-02-13 07:40:52 -08:00
snipe	471fcd1272	Set beta version tag	2019-02-13 02:27:56 -08:00
snipe	c0669150fb	Bumped point version	2019-02-12 23:48:31 -08:00
snipe	117b4c59cc	Bumped minor version	2019-01-25 21:06:08 -08:00
snipe	794824713e	Bumped minor version	2019-01-03 11:22:06 -08:00
snipe	925258bfb4	Bumped version	2018-10-26 15:29:10 -07:00
snipe	41b5b1dfd0	Bumped hash	2018-10-09 17:32:46 -07:00
snipe	c39e3acb59	Bumped hash	2018-10-04 02:24:41 -07:00
snipe	ef0bd72076	Bumped version	2018-09-28 11:21:39 -07:00
snipe	ba3662a9ed	Bumped hash	2018-09-07 18:12:29 -07:00
snipe	22ef2ce0b6	Bumped hash	2018-09-07 03:20:31 -07:00
snipe	d8a8e1cc09	Bumped version	2018-08-28 11:43:56 -07:00
snipe	101dfd01f2	Bumped hash	2018-08-14 18:22:53 -07:00
snipe	24c949c886	Bumped version to v5.0.0-pre	2018-07-24 21:13:02 -07:00
snipe	4e55a18a60	Bumped version	2018-07-24 19:46:23 -07:00
snipe	e332442132	Bumped version	2018-07-24 19:45:23 -07:00
snipe	aa9c0078a1	Merge branch 'develop' ... # Conflicts: # config/version.php	2018-07-19 14:47:27 -07:00
snipe	9677115055	Bumped version	2018-07-19 14:46:08 -07:00
snipe	f692fb5bff	Merge branch 'develop' ... # Conflicts: # config/version.php	2018-07-19 10:50:18 -07:00
snipe	83692696ba	Bumped version	2018-07-19 10:49:40 -07:00
snipe	8d23398176	Merge branch 'develop' ... # Conflicts: # config/version.php	2018-07-18 20:07:14 -07:00
snipe	5aae930e8c	Bumped version	2018-07-18 20:05:48 -07:00
snipe	8a25677a8d	Bumped hash	2018-07-16 21:35:21 -07:00
snipe	52d605d13e	Merge branch 'develop' ... # Conflicts: # config/version.php	2018-07-09 19:21:23 -07:00
snipe	0182615e7e	Bumped version	2018-07-09 19:18:38 -07:00
snipe	fad84d4437	Merge branch 'develop' ... # Conflicts: # config/version.php	2018-07-09 19:07:49 -07:00
snipe	c162e9a4de	Bumped hash	2018-07-09 19:06:56 -07:00
snipe	ea4cdadc6e	Bumped version	2018-06-21 07:44:58 -07:00
snipe	eb412c2bcb	Missed one	2018-06-21 07:43:12 -07:00
snipe	fde4a59510	Bumped version	2018-06-21 07:40:37 -07:00
snipe	2ecc4aead7	Merge branch 'develop' ... # Conflicts: # config/version.php	2018-05-21 15:43:48 -07:00
snipe	d8210847a4	Bumped version	2018-05-21 15:43:04 -07:00
snipe	11832daf5c	Merge branch 'develop' ... # Conflicts: # config/version.php	2018-05-21 15:17:40 -07:00
snipe	79555f5647	Bumped version	2018-05-21 15:16:56 -07:00
snipe	1868013704	Merge branch 'develop' ... # Conflicts: # config/version.php	2018-05-21 14:59:08 -07:00
snipe	39cc13f155	Bumped version	2018-05-21 14:58:16 -07:00
snipe	0b5bb520a7	Merge branch 'develop' ... # Conflicts: # config/version.php	2018-05-16 19:24:31 -07:00
snipe	fa89f45cb8	Bumped hash	2018-05-16 19:22:59 -07:00
snipe	25f537e730	Merge branch 'develop' ... # Conflicts: # config/version.php	2018-05-08 03:49:28 -07:00
snipe	6d8af3d9c0	Bumped hash	2018-05-08 03:48:35 -07:00
snipe	0116fa9b95	Merge branch 'develop' ... # Conflicts: # config/version.php	2018-05-02 14:35:16 -07:00
snipe	42f0eebf8f	Bumped version	2018-05-02 14:33:01 -07:00
snipe	4c5f20fde4	Merge branch 'develop' ... # Conflicts: # app/Importer/Importer.php # config/version.php	2018-04-23 13:33:34 -07:00
snipe	def1eb0b5f	Bumped hash	2018-04-20 13:52:32 -07:00
snipe	bdbc189a4f	Bumped hash	2018-04-20 13:51:54 -07:00
snipe	c1838a60df	Bumped hash	2018-04-04 17:36:47 -07:00
snipe	83781f3a70	Merge branch 'develop' ... # Conflicts: # config/version.php	2018-03-26 15:20:40 -07:00
snipe	5f1ec550ec	Fixed hash	2018-03-26 15:16:35 -07:00
snipe	95f8dccc14	Bumped hash	2018-03-26 15:15:43 -07:00
snipe	846613c244	Merge branch 'develop' ... # Conflicts: # config/version.php	2018-03-22 20:48:02 -07:00
snipe	c4c137dc08	Bumped to 4.2.0	2018-03-22 20:47:09 -07:00
snipe	469efc923b	Merge branch 'develop' ... # Conflicts: # README.md # config/version.php	2018-03-22 20:08:55 -07:00
snipe	dcd74f6922	Bumped version	2018-03-22 20:07:06 -07:00