Sergey Linnik 2782f8f9bd Merge remote-tracking branch 'remotes/origin/develop' into feature/comment-group ...

# Conflicts:
#	web/documentserver-example/csharp-mvc/Helpers/Users.cs
#	web/documentserver-example/csharp/Users.cs
#	web/documentserver-example/java/src/main/java/entities/FileModel.java
#	web/documentserver-example/java/src/main/java/entities/User.java
#	web/documentserver-example/java/src/main/java/helpers/Users.java
#	web/documentserver-example/nodejs/helpers/users.js
#	web/documentserver-example/php/users.php
#	web/documentserver-example/python/src/utils/users.py
#	web/documentserver-example/ruby/app/models/users.rb

2021-06-17 10:11:07 +03:00

..

FileModel.cs

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

2021-06-17 10:11:07 +03:00

FileUtility.cs

csharp-mvs: added comments

2021-04-20 17:33:49 +03:00