Merge remote-tracking branch 'origin/OpenOLAT_12.5' (689a352f) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

OLAT CI-CD Testing Project
- Activity
- Members
- Labels
- Terraform modules
- Service Desk
- Contributor analytics
- Model experiments

Snippets Groups Projects

689a352f

Commit 689a352f authored 6 years ago by srosse

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/OpenOLAT_12.5'

Conflicts:
	.gitignore

parents a280b4ae 165feccd

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
pom.xml 38 additions, 1 deletion

pom.xml
src/main/resources/database/mysql/alter_12_4_x_to_12_5_0.sql 1 addition, 1 deletion

src/main/resources/database/mysql/alter_12_4_x_to_12_5_0.sql
src/main/resources/database/oracle/alter_12_4_x_to_12_5_0.sql 1 addition, 1 deletion

...main/resources/database/oracle/alter_12_4_x_to_12_5_0.sql
src/main/resources/database/postgresql/alter_12_4_x_to_12_5_0.sql 1 addition, 1 deletion

.../resources/database/postgresql/alter_12_4_x_to_12_5_0.sql

with 42 additions and 4 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment