Commit Graph

7 Commits

Author SHA1 Message Date
Sebastiaan Janssen
5831cd9159 Merge branch 'v7/dev' into v8/dev
# Conflicts:
#	src/Umbraco.Core/Serialization/JsonNetSerializer.cs
#	src/Umbraco.Web/Editors/BackOfficeController.cs
2019-09-26 13:45:50 +02:00
Benjamin Howarth
16837d018a #2996 changed formatting to none for both data transfer & persistence 2019-09-26 13:33:41 +02:00
Benjamin Howarth
d3c4aace16 #2996 added GlobalSettings.DebugMode switch for JSON formatting indentation. 2019-09-26 13:33:41 +02:00
Warren Buckley
54a2aa00a7 Revert "Temp8 tinymce" 2018-11-22 14:05:51 +00:00
Stephan
7a615133ff Renormalize 2018-06-29 19:52:40 +02:00
Stephan
c76403077f Normalize cr/lf/tab 2017-07-20 11:21:28 +02:00
Morten Christensen
14aeb55c14 Removing unused ServiceStack.Text reference/nuget package.
Ignore Macro tests for the model and repo as its not used and still internal. Might be an idea to remove it altogether.
2013-04-04 12:02:27 -02:00