3
0
mirror of https://github.com/snipe/snipe-it.git synced 2026-02-08 08:55:37 +00:00
Commit Graph

217 Commits

Author SHA1 Message Date
24c949c886 Bumped version to v5.0.0-pre 2018-07-24 21:13:02 -07:00
e332442132 Bumped version 2018-07-24 19:45:23 -07:00
9677115055 Bumped version 2018-07-19 14:46:08 -07:00
83692696ba Bumped version 2018-07-19 10:49:40 -07:00
5aae930e8c Bumped version 2018-07-18 20:05:48 -07:00
8a25677a8d Bumped hash 2018-07-16 21:35:21 -07:00
0182615e7e Bumped version 2018-07-09 19:18:38 -07:00
c162e9a4de Bumped hash 2018-07-09 19:06:56 -07:00
eb412c2bcb Missed one 2018-06-21 07:43:12 -07:00
fde4a59510 Bumped version 2018-06-21 07:40:37 -07:00
2ecc4aead7 Merge branch 'develop'
# Conflicts:
#	config/version.php
2018-05-21 15:43:48 -07:00
d8210847a4 Bumped version 2018-05-21 15:43:04 -07:00
11832daf5c Merge branch 'develop'
# Conflicts:
#	config/version.php
2018-05-21 15:17:40 -07:00
79555f5647 Bumped version 2018-05-21 15:16:56 -07:00
1868013704 Merge branch 'develop'
# Conflicts:
#	config/version.php
2018-05-21 14:59:08 -07:00
39cc13f155 Bumped version 2018-05-21 14:58:16 -07:00
0b5bb520a7 Merge branch 'develop'
# Conflicts:
#	config/version.php
2018-05-16 19:24:31 -07:00
fa89f45cb8 Bumped hash 2018-05-16 19:22:59 -07:00
25f537e730 Merge branch 'develop'
# Conflicts:
#	config/version.php
2018-05-08 03:49:28 -07:00
6d8af3d9c0 Bumped hash 2018-05-08 03:48:35 -07:00
0116fa9b95 Merge branch 'develop'
# Conflicts:
#	config/version.php
2018-05-02 14:35:16 -07:00
42f0eebf8f Bumped version 2018-05-02 14:33:01 -07:00
4c5f20fde4 Merge branch 'develop'
# Conflicts:
#	app/Importer/Importer.php
#	config/version.php
2018-04-23 13:33:34 -07:00
def1eb0b5f Bumped hash 2018-04-20 13:52:32 -07:00
bdbc189a4f Bumped hash 2018-04-20 13:51:54 -07:00
c1838a60df Bumped hash 2018-04-04 17:36:47 -07:00
83781f3a70 Merge branch 'develop'
# Conflicts:
#	config/version.php
2018-03-26 15:20:40 -07:00
5f1ec550ec Fixed hash 2018-03-26 15:16:35 -07:00
95f8dccc14 Bumped hash 2018-03-26 15:15:43 -07:00
846613c244 Merge branch 'develop'
# Conflicts:
#	config/version.php
2018-03-22 20:48:02 -07:00
c4c137dc08 Bumped to 4.2.0 2018-03-22 20:47:09 -07:00
469efc923b Merge branch 'develop'
# Conflicts:
#	README.md
#	config/version.php
2018-03-22 20:08:55 -07:00
dcd74f6922 Bumped version 2018-03-22 20:07:06 -07:00
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
abac3e7758 Bumped hash 2018-03-22 09:44:54 -07:00
01eaf48471 Merge branch 'develop'
# Conflicts:
#	config/version.php
2018-03-07 18:25:12 -08:00
238a075c6a Bumped hash 2018-03-07 18:24:09 -08:00
d42361bac1 Merge branch 'develop'
# Conflicts:
#	config/version.php
2018-03-05 20:27:50 -08:00
fabc9e5d1c Bumped hash 2018-03-03 17:15:59 -08:00
c250c632f3 Merge branch 'develop'
# Conflicts:
#	config/version.php
2018-02-26 15:46:49 -08:00
e3fb4f8799 Bumped hash 2018-02-26 15:44:36 -08:00
7c9c6ea3df Merge branch 'develop'
# Conflicts:
#	config/version.php
2018-02-22 16:40:19 -08:00
7d49c4de87 Bumped hash 2018-02-22 16:39:12 -08:00
3131c0d0ac Merge branch 'develop'
# Conflicts:
#	config/version.php
2018-02-21 16:45:21 -08:00
364e9cf3de Bumped version 2018-02-21 16:43:00 -08:00
d511d90a2f Merge branch 'develop'
# Conflicts:
#	config/version.php
2018-02-21 06:50:42 -08:00
54d6cafda9 Bumped hash 2018-02-21 06:49:36 -08:00
cccd75fc42 Merge branch 'develop'
# Conflicts:
#	config/version.php
2018-02-21 05:48:02 -08:00
dbc16a6c9b Bumped hash 2018-02-21 05:47:12 -08:00
42c8de5620 Merge branch 'develop'
# Conflicts:
#	config/version.php
2018-02-21 04:44:48 -08:00