_ Git - pmi.git/commit

]> _ Git - pmi.git/commit

author	Vincent Vanwaelscappel <vincent@cubedesigners.com>
	Mon, 27 May 2019 10:13:20 +0000 (12:13 +0200)
committer	Vincent Vanwaelscappel <vincent@cubedesigners.com>
	Mon, 27 May 2019 10:13:20 +0000 (12:13 +0200)
commit	797191b7fc5e7b68dbd1ec1ea39c1ae69da990d9
tree	b9bd18d24b0a2ff85e780776c81d02374ee36358	tree \| snapshot
parent	a4331b296d3f27a5e596bf61a033db3edff69fd0	commit \| diff

Merge branch 'master' of H:\Works\PMI with conflicts.

21 files changed:

app/Models/Category.php	[new file with mode: 0644]	blob
composer.json		diff \| blob \| history
composer.lock		diff \| blob \| history
public/packages/barryvdh/elfinder/css/elfinder.full.css		diff \| blob \| history
public/packages/barryvdh/elfinder/css/elfinder.min.css		diff \| blob \| history
public/packages/barryvdh/elfinder/css/theme.css		diff \| blob \| history
public/packages/barryvdh/elfinder/img/editor-icons.png		diff \| blob \| history
public/packages/barryvdh/elfinder/js/elfinder.full.js		diff \| blob \| history
public/packages/barryvdh/elfinder/js/elfinder.min.js		diff \| blob \| history
public/packages/barryvdh/elfinder/js/extras/editors.default.js		diff \| blob \| history
public/packages/barryvdh/elfinder/js/extras/editors.default.min.js		diff \| blob \| history
public/packages/barryvdh/elfinder/js/i18n/elfinder.LANG.js		diff \| blob \| history
public/packages/barryvdh/elfinder/js/i18n/elfinder.cs.js		diff \| blob \| history
public/packages/barryvdh/elfinder/js/i18n/elfinder.it.js		diff \| blob \| history
public/packages/barryvdh/elfinder/js/i18n/elfinder.ja.js		diff \| blob \| history
public/packages/barryvdh/elfinder/js/i18n/elfinder.pl.js		diff \| blob \| history
public/packages/barryvdh/elfinder/js/i18n/elfinder.ru.js		diff \| blob \| history
public/packages/barryvdh/elfinder/js/i18n/elfinder.sk.js		diff \| blob \| history
resources/views/vendor/backpack/base/inc/sidebar_content.blade.php		diff \| blob \| history
routes/backpack/custom.php		diff \| blob \| history
update	[new file with mode: 0644]	blob

Unnamed repository; edit this file 'description' to name the repository.