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

..

api

Facebook prijava, pravi api klic.

2021-01-28 23:43:13 +01:00

drupal

Drupal: ob kliku na odjavo odjavi in osvezi stran.

2021-03-05 12:52:11 +01: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-03-06 17:20:12 +01:00

simple

Popravek zaklepanja prijave glede na ip

2020-12-11 11:54:40 +01:00