Skip to content
GitLab
Commit eb582d12 authored by Антонов Егор Алексеевич's avatar Антонов Егор Алексеевич
Browse files

Merge branch 'xserver' into 'profile' 

# Conflicts:
#   movere_local/mainapp/views.py
parents e859f5f0 72dbdcad
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 4556 additions and 430 deletions
+4556 -430
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment