# Conflicts:
#   note_kfet/settings/development.py

always save to png

See merge request !37

fix static files config for development enviromnent

See merge request !36

Use example.org in nginx_note.conf_example

See merge request !34

Fix anonymous users issue

See merge request !35

Logs

See merge request !28

# Conflicts:
#   locale/de/LC_MESSAGES/django.po
#   locale/fr/LC_MESSAGES/django.po

Alias

See merge request !31

# Conflicts:
#   note_kfet/settings/base.py
#   note_kfet/urls.py

CAS

See merge request !29

Static files

See merge request !24

fix #27

Closes #27

See merge request !30

Fix #25

Closes #25

See merge request !27