Merge remote-tracking branch 'origin/master'

Evolveum · Jun 6, 2018 · 4fd7115 · 4fd7115
2 parents cf323c7 + 0cb8716
commit 4fd7115
Show file tree

Hide file tree

Showing 17 changed files with 5,207 additions and 5,171 deletions.
diff --git a/config/sql/midpoint/3.7/h2/h2-upgrade-3.6-3.7.sql b/config/sql/midpoint/3.7/h2/h2-upgrade-3.6-3.7.sql
diff --git a/config/sql/midpoint/3.7/h2/h2-upgrade-3.7-3.8.sql b/config/sql/midpoint/3.7/h2/h2-upgrade-3.7-3.8.sql
diff --git a/config/sql/midpoint/3.7/mysql/mysql-upgrade-3.6-3.7.sql b/config/sql/midpoint/3.7/mysql/mysql-upgrade-3.6-3.7.sql
diff --git a/config/sql/midpoint/3.7/mysql/mysql-upgrade-3.7-3.8.sql b/config/sql/midpoint/3.7/mysql/mysql-upgrade-3.7-3.8.sql
diff --git a/config/sql/midpoint/3.7/oracle/oracle-upgrade-3.6-3.7.sql b/config/sql/midpoint/3.7/oracle/oracle-upgrade-3.6-3.7.sql
diff --git a/config/sql/midpoint/3.7/oracle/oracle-upgrade-3.7-3.8.sql b/config/sql/midpoint/3.7/oracle/oracle-upgrade-3.7-3.8.sql