pavelbannov 028b63213c Merge branch 'develop' into features/migrate-urlShortener ... # Conflicts: # common/Tools/ASC.Migration.Creator/Program.cs # common/Tools/ASC.Migration.Runner/Program.cs # migrations/mysql/UrlShortenerDbContext/20221019144355_UrlShortenerDbContextMigrate.Designer.cs # migrations/mysql/UrlShortenerDbContext/20221019144355_UrlShortenerDbContextMigrate.cs # migrations/mysql/UrlShortenerDbContext/UrlShortenerDbContextModelSnapshot.cs # migrations/postgre/SaaS/CoreDbContext/20230414201715_CoreDbContext_Upgrade1.Designer.cs # migrations/postgre/SaaS/CoreDbContext/20230414201715_CoreDbContext_Upgrade1.cs # migrations/postgre/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs # migrations/postgre/SaaS/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.Designer.cs # migrations/postgre/SaaS/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.cs # migrations/postgre/SaaS/UrlShortenerFakeDbContext/UrlShortenerFakeDbContextModelSnapshot.cs # migrations/postgre/UrlShortenerDbContext/20221019144356_UrlShortenerDbContextMigrate.Designer.cs # migrations/postgre/UrlShortenerDbContext/20221019144356_UrlShortenerDbContextMigrate.cs # migrations/postgre/UrlShortenerDbContext/UrlShortenerDbContextModelSnapshot.cs # migrations/postgre/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.Designer.cs # migrations/postgre/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.cs # migrations/postgre/UrlShortenerFakeDbContext/UrlShortenerFakeDbContextModelSnapshot.cs # web/ASC.Web.Api/Api/PortalController.cs # web/ASC.Web.Api/Api/Settings/SettingsController.cs # web/ASC.Web.Api/Startup.cs # web/ASC.Web.Core/Utility/UrlShortener.cs		2023-07-26 14:30:00 +03:00
..
includes	Nginx: fix	2019-12-11 18:36:51 +03:00
sites-enabled	Web: Removed useless for static build	2022-09-02 11:31:35 +03:00
batch.js	Nginx: batch.json	2019-09-10 16:07:39 +03:00
onlyoffice-client.conf	Web: Renamed 'studio' to 'client' (bat-files, nginx configs, react, MF, themes)	2022-08-01 15:37:33 +03:00
onlyoffice-login.conf	Web: Renamed 'studio' to 'client' (bat-files, nginx configs, react, MF, themes)	2022-08-01 15:37:33 +03:00
onlyoffice-story.conf	Nginx: storybook	2019-07-15 16:57:53 +03:00
onlyoffice.conf	Merge branch 'develop' into features/migrate-urlShortener	2023-07-26 14:30:00 +03:00
proxy-frontend-virt.conf	nginx: replaced localhost with 127.0.0.1, because sometimes localhost resolved nginx as ipv6	2022-09-07 19:18:43 +03:00
proxy-frontend.conf	nginx: replaced localhost with 127.0.0.1, because sometimes localhost resolved nginx as ipv6	2022-09-07 19:18:43 +03:00