Alexandr Fedorov 8e6ae3b915 Merge remote-tracking branch 'remotes/origin/develop' into feature/reviewPermissions ...

# Conflicts:
#	web/documentserver-example/csharp-mvc/Models/FileModel.cs
#	web/documentserver-example/csharp/DocEditor.aspx.cs
#	web/documentserver-example/java/src/main/java/entities/FileModel.java
#	web/documentserver-example/python/src/views/actions.py
#	web/documentserver-example/ruby/app/models/file_model.rb

2021-02-18 15:13:34 +03:00

..

config.ejs

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

2021-02-18 15:13:34 +03:00

editor.ejs

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

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

error.ejs

fixed license comment 8050ec572a

2020-11-10 17:10:43 +03:00

index.ejs

Merge pull request #122 from ONLYOFFICE/feature/request-name

2021-02-18 14:14:00 +03:00