DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
3618 commits 52 branches 269 tags 311 MiB
Commit graph

201 commits

Author SHA1 Message Date
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
snipe 96bab5697d Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	config/version.php
#	database/migrations/2018_02_22_160436_add_remote_user_settings.php
 2018-03-22 09:46:50 -07:00
snipe abac3e7758 Bumped hash 2018-03-22 09:44:54 -07:00
snipe 01eaf48471 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-03-07 18:25:12 -08:00
snipe 238a075c6a Bumped hash 2018-03-07 18:24:09 -08:00
snipe d42361bac1 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-03-05 20:27:50 -08:00
snipe fabc9e5d1c Bumped hash 2018-03-03 17:15:59 -08:00
snipe c250c632f3 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-02-26 15:46:49 -08:00
snipe e3fb4f8799 Bumped hash 2018-02-26 15:44:36 -08:00
snipe 7c9c6ea3df Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-02-22 16:40:19 -08:00
snipe 7d49c4de87 Bumped hash 2018-02-22 16:39:12 -08:00
snipe 3131c0d0ac Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-02-21 16:45:21 -08:00
snipe 364e9cf3de Bumped version 2018-02-21 16:43:00 -08:00
snipe d511d90a2f Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-02-21 06:50:42 -08:00
snipe 54d6cafda9 Bumped hash 2018-02-21 06:49:36 -08:00
snipe cccd75fc42 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-02-21 05:48:02 -08:00
snipe dbc16a6c9b Bumped hash 2018-02-21 05:47:12 -08:00
snipe 42c8de5620 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-02-21 04:44:48 -08:00
snipe ba4f63bca3 Bumped version 2018-02-21 04:43:52 -08:00
snipe 97bd87773c Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-02-21 02:40:23 -08:00
snipe b560828173 Bumped hash 2018-02-21 02:18:14 -08:00
snipe 7865fbea7e Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-02-21 01:27:11 -08:00
snipe 5fcbf9091e Bumped version 2018-02-21 01:23:19 -08:00
snipe 6e70352d0b Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-02-17 01:05:20 -08:00
snipe 9a4f5e0ba8 Bumped hash 2018-02-16 22:10:06 -08:00
snipe 5302108556 Update to master 2018-02-16 13:27:03 -08:00
snipe 27c1bc0271 Bumped hash 2018-02-16 13:24:47 -08:00
snipe 8b2045523d Bumped hash 2018-02-01 15:55:33 -06:00
snipe e77aae703b Bumped hash 2018-01-25 11:03:45 -08:00
snipe f5636f325d Bumped hash 2018-01-24 11:01:51 -08:00
snipe fcb5eea951 Bumped hash 2018-01-24 08:28:53 -08:00
snipe a28fee1ff4 Bumped hash 2018-01-20 07:47:07 -08:00
snipe f53c68e040 Bumped hash 2018-01-20 04:40:26 -08:00
snipe 913e6a5709 Bumped hash 2018-01-20 03:59:42 -08:00