fix: conflict solved
No related branches found
No related tags found
- README.md 1 Ergänzung, 0 LöschungenREADME.md
- bin/images/Gitlab.jpg 0 Ergänzungen, 0 Löschungenbin/images/Gitlab.jpg
- bin/images/Logo.jpg 0 Ergänzungen, 0 Löschungenbin/images/Logo.jpg
- bin/images/Readme.jpg 0 Ergänzungen, 0 Löschungenbin/images/Readme.jpg
- composer.json 1 Ergänzung, 1 Löschungcomposer.json
- locale.xml 2 Ergänzungen, 3 Löschungenlocale.xml
bin/images/Gitlab.jpg
0 → 100755
3,19 KiB
bin/images/Logo.jpg
0 → 100755
43,2 KiB
bin/images/Readme.jpg
0 → 100755
36,3 KiB
{ | ||
"name": "quiqqer/bricks", | ||
"type": "quiqqer-module", | ||
"description": "Bricks Module", | ||
"description": "The brick system allows you to design your website according to your wishes. You can quickly move, create, or remove bricks to different places in the template.", | ||
"version": "dev-master", | ||
"license": "MIT", | ||
"authors": [ | ||
... | ... |