Skip to content
Snippets Groups Projects
Commit 6cb3f084 authored by Vikas's avatar Vikas
Browse files

Merge remote-tracking branch 'upstream/master'

Conflicts:
	schema/DatabaseSchema.xml
parents 0ebf4f2c a1da35e8
No related branches found
No related tags found
No related merge requests found
Showing
with 40 additions and 35 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 to comment