Skip to content
Snippets Groups Projects
Commit 9c67c3ee authored by v.tarantik's avatar v.tarantik
Browse files

Merge branch 'feature-pursuit' into feature-pursuit_devel

Conflicts:
	core/src/cz/nic/tablexia/TablexiaSettings.java
parents 6ffb0207 5b5f63e2
No related branches found
No related tags found
No related merge requests found
Showing
with 23 additions and 1 deletion
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