tsai
/
squidex
mirror of https://github.com/Squidex/squidex.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'master' into next

pull/372/head
Sebastian Stehle 7 years ago
parent
511b5afa9b ac2aac15ff
commit
0a5ba8c964
2 changed files with 2 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      .testrunsettings
  2. 2
      README.md

6
.testrunsettings
View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RunSettings>
<RunConfiguration>
<MaxCpuCount>4</MaxCpuCount>
</RunConfiguration>
</RunSettings>

2
README.md
View File

@ -16,7 +16,7 @@ Please join our community forum: https://support.squidex.io
## Status ## Status
Current Version v2.0.4. Roadmap: https://trello.com/b/KakM4F3S/squidex-roadmap Current Version v2.1.0. Roadmap: https://trello.com/b/KakM4F3S/squidex-roadmap
## Prerequisites ## Prerequisites

Write Preview
Loading…
Cancel
Save