f5ab47ff19
(cherry picked from commit 151f18bd96
)
Conflicts:
.gitignore
24 lines
193 B
Plaintext
24 lines
193 B
Plaintext
.htaccess
|
|
.htpasswd
|
|
admin/logs_studs.txt
|
|
composer.phar
|
|
framanav
|
|
nav
|
|
app/inc/constants.php
|
|
vendor
|
|
cache/
|
|
tpl_c/
|
|
|
|
# Temp files
|
|
*~
|
|
\#*\#
|
|
|
|
# Cache
|
|
Thumbs.db
|
|
|
|
# IDE
|
|
.settings/
|
|
.project
|
|
.idea/
|
|
*.iml
|