IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5060e81b5f
DocSpace-client/products/ASC.Calendar/Server/Resources
History
Vashchuk Nikita 82abf11109 Merge branch 'develop' into feature/calendar 
# Conflicts:
#	ASC.Web.sln
#	config/autofac.products.json
#	config/nginx/onlyoffice.conf
#	products/ASC.Calendar/Server/ASC.Calendar.csproj
#	products/ASC.Calendar/Server/Controllers/CalendarController.cs
#	products/ASC.Calendar/Server/Program.cs
#	products/ASC.Calendar/Server/Properties/launchSettings.json
#	products/ASC.Calendar/Server/Resources/CalendarAddonResource.Designer.cs
#	products/ASC.Calendar/Server/Resources/CalendarAddonResource.resx
#	products/ASC.Calendar/Server/Startup.cs
2021-05-18 13:24:02 +03:00
..
CalendarAddonResource.de.resx Calendar: translations 2021-04-23 16:01:14 +03:00
CalendarAddonResource.Designer.cs Merge branch 'develop' into feature/calendar 2021-05-18 13:24:02 +03:00
CalendarAddonResource.es.resx Calendar: translations 2021-04-23 16:01:14 +03:00
CalendarAddonResource.fr.resx Calendar: translations 2021-04-23 16:01:14 +03:00
CalendarAddonResource.it.resx Calendar: translations 2021-04-23 16:01:14 +03:00
CalendarAddonResource.resx Calendar: translations 2021-04-23 16:01:14 +03:00
CalendarAddonResource.ru.resx Calendar: translations 2021-04-23 16:01:14 +03:00
CalendarApiResource.Designer.cs Calendar: added a models 2020-02-13 12:18:13 +03:00
CalendarApiResource.resx Calendar: added a models 2020-02-13 12:18:13 +03:00
CalendarResource.Designer.cs init Calendar 2020-02-12 10:58:31 +03:00
CalendarResource.resx init Calendar 2020-02-12 10:58:31 +03:00
CalendarResource.ru.resx init Calendar 2020-02-12 10:58:31 +03:00