Solve conflicts

This commit is contained in:
KoenemannH 2018-07-27 08:36:50 +02:00
parent cebefb96b1
commit 521548ee59
1 changed files with 8 additions and 0 deletions

View File

@ -4,11 +4,19 @@
- ** Release 0.8.5 July 26th 2018 ** - ** Release 0.8.5 July 26th 2018 **
- Update to Bootstrap 4.1.3 - Update to Bootstrap 4.1.3
- ** Release 0.8.4 July 16th 2018 ** Maintenace Release: - ** Release 0.8.4 July 16th 2018 ** Maintenace Release:
- Update to Bootstrap 4.1.2 - Update to Bootstrap 4.1.2
- fixing sidebar.php problem - fixing sidebar.php problem
- Revert to Gulp 3.x support - Revert to Gulp 3.x support
- ** Maintenance Release 0.8.4 July 16th 2018 **
- Update to Bootstrap 4
- fixing sidebar.php problem
- Revert to Gulp 3.x support
- ** Release 0.8.3 July 3rd 2018 ** - ** Release 0.8.3 July 3rd 2018 **
- Update to Bootstrap 4.1.1 - Update to Bootstrap 4.1.1
- Update to Gulp 4 - Update to Gulp 4