pero1203 7a164a0848 Merge branch 'master' into release/produkcija ...

# Conflicts:
#	long_term_TODO.txt
#	readme.md
#	resources/sass/admin/branching/library.scss
#	resources/sass/admin/dashboard/dashboard.scss
#	resources/sass/admin/data/other.scss
#	resources/sass/admin/main_page/main_page_base.scss
#	resources/sass/admin/mobile/basic.scss
#	resources/sass/admin/mobile/header.scss
#	resources/sass/admin/mobile/mobile.scss
#	resources/sass/admin/mobile/pages/data.scss
#	resources/sass/admin/mobile/pages/new_survey.scss
#	resources/sass/admin/mobile/responsive_fixes.scss
#	resources/sass/admin/navigation.scss
#	resources/sass/admin/new_survey_page/no_survey_page.scss
#	resources/sass/admin/new_survey_page/right_content.scss
#	resources/sass/admin/publish/invitations.scss
#	resources/sass/admin/survey_settings/archive.scss
#	resources/sass/frontend_simple/basic/basic.scss
#	resources/sass/frontend_simple/basic/mobile.scss
#	resources/sass/frontend_simple/modules/footer.scss
#	resources/sass/frontend_simple/style.scss

2021-08-04 10:41:33 +02:00

..

api

Ciscenje neuporabljenih datotek, kode

2021-06-17 21:57:58 +02:00

drupal

Drupal: popravek mobilnik.

2021-07-28 10:29:08 +02:00

drupal_migration

Dodan nov repozitorij

2020-08-14 13:36:36 +02:00

install

Popravki noticeov in warningov povezanih z php 7.4

2020-12-07 09:43:59 +01:00

payments

Merge branch 'master' into release/produkcija

2021-08-04 10:41:33 +02:00

simple

Cookie notice na simple frontendu je samo na aai

2021-06-16 09:57:47 +02:00