Alexandr Fedorov 361b8bd0f4 Merge remote-tracking branch 'remotes/origin/develop' into feature/mail-merge ...

# Conflicts:
#	web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
#	web/documentserver-example/csharp-mvc/WebEditor.ashx.cs
#	web/documentserver-example/csharp/DocEditor.aspx
#	web/documentserver-example/csharp/DocEditor.aspx.cs
#	web/documentserver-example/csharp/WebEditor.ashx.cs
#	web/documentserver-example/java/src/main/java/controllers/EditorServlet.java
#	web/documentserver-example/java/src/main/java/controllers/IndexServlet.java
#	web/documentserver-example/java/src/main/webapp/editor.jsp
#	web/documentserver-example/nodejs/app.js
#	web/documentserver-example/nodejs/views/editor.ejs
#	web/documentserver-example/php/doceditor.php
#	web/documentserver-example/php/webeditor-ajax.php
#	web/documentserver-example/python/src/views/actions.py
#	web/documentserver-example/python/templates/editor.html
#	web/documentserver-example/ruby/app/models/file_model.rb
#	web/documentserver-example/ruby/app/views/home/editor.html.erb

2021-02-01 16:57:59 +03:00

..

utils

python: add DOC_SERV_JWT_HEADER

2020-11-24 13:27:54 +03:00

views

Merge remote-tracking branch 'remotes/origin/develop' into feature/mail-merge

2021-02-01 16:57:59 +03:00

settings.py

python: compare-file

2020-11-26 18:30:27 +03:00

urls.py

python: mailmerge

2020-11-18 17:48:19 +03:00

wsgi.py

python: django template

2019-10-25 16:54:23 +03:00