pero1203
|
393bf48aaf
|
Merge branch 'master' into release/produkcija
# Conflicts:
# .gitignore
# composer.lock
# resources/sass/admin/branching/branching_collapsed.scss
# resources/sass/admin/branching/branching_expanded.scss
# resources/sass/admin/branching/form.scss
# resources/sass/admin/branching/voting.scss
# resources/sass/admin/footer.scss
# resources/sass/admin/icons/standard.scss
# resources/sass/admin/main_page/survey_list.scss
# resources/sass/admin/media.scss
# resources/sass/admin/popup/basic.scss
# resources/sass/admin/popup/popup.scss
# resources/sass/admin/users.scss
# resources/sass/main/main/admin.scss
# resources/sass/main/main_mobile/content.scss
# vendor/autoload.php
# vendor/composer/autoload_files.php
# vendor/composer/autoload_real.php
# vendor/composer/autoload_static.php
# vendor/composer/installed.json
|
2021-03-06 17:20:12 +01:00 |
|