Alexey Safronov ac5017da99 Merge branch 'master' into feature/elastic ... # Conflicts: # build/build.bat # build/rebuild.bat		2020-02-26 10:46:37 +03:00
..
includes	Nginx: fix	2019-12-11 18:36:51 +03:00
batch.js	Nginx: batch.json	2019-09-10 16:07:39 +03:00
onlyoffice-people.conf	Nginx: fix routing	2019-08-06 14:27:19 +03:00
onlyoffice-story.conf	Nginx: storybook	2019-07-15 16:57:53 +03:00
onlyoffice-studio.conf	Nginx: fix routing	2019-08-06 14:27:19 +03:00
onlyoffice.conf	Merge branch 'master' into feature/elastic	2020-02-26 10:46:37 +03:00