Skip to content
Snippets Groups Projects
Commit 0ea1c641 authored by Luboš Horáček's avatar Luboš Horáček
Browse files

Merge branch 'devel' into feature-createuser

Conflicts:
	core/src/cz/nic/tablexia/TablexiaSettings.java
parents 1349c70b a2d521af
Branches
Tags
No related merge requests found
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment