pero1203 0ffc82b55f Merge branch 'master' into release/produkcija ...

# Conflicts:
#	admin/survey/classes/class.Vprasanje.php
#	admin/survey/export/latexclasses/class.LatexSurvey.php
#	composer.lock
#	resources/sass/admin/Settings/navigation.scss
#	resources/sass/admin/admin.scss
#	resources/sass/admin/basic/basic.scss
#	resources/sass/admin/branching/questions/question_box.scss
#	resources/sass/admin/branching/toolbox.scss
#	resources/sass/admin/comments.scss
#	resources/sass/admin/header.scss
#	resources/sass/admin/icons/invitation.scss
#	resources/sass/admin/icons/modules.scss
#	resources/sass/admin/icons/question_edit.scss
#	resources/sass/admin/icons/standard.scss
#	resources/sass/admin/library.scss
#	resources/sass/admin/payments.scss
#	resources/sass/admin/publish/invitations.scss
#	resources/sass/admin/publish/settings.scss
#	resources/sass/admin/users.scss
#	resources/sass/main/main/basic.scss
#	resources/sass/main/main/content.scss
#	resources/sass/main/main_mobile/content.scss
#	vendor/composer/autoload_files.php
#	vendor/composer/autoload_static.php
#	vendor/composer/installed.json
#	vendor/maxmind-db/reader/CHANGELOG.md
#	vendor/maxmind-db/reader/composer.json
#	vendor/maxmind-db/reader/ext/php_maxminddb.h
#	vendor/maxmind-db/reader/package.xml
#	vendor/maxmind-db/reader/src/MaxMind/Db/Reader/Decoder.php

2021-06-05 14:05:41 +02:00

..

api

Fix: popravek pri registraciji vrne v pravem jeziku.

2021-05-21 14:46:26 +02:00

drupal

Drupal: Popravki besedila.

2021-06-03 14:27:09 +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-06-05 14:05:41 +02:00

simple

Popravek zaklepanja prijave glede na ip

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