Skip to content
Snippets Groups Projects
Commit 72c26830 authored by Carsten  Rose's avatar Carsten Rose
Browse files

Merge branch 'develop' into F13679_subrecord_tablesorter_view_saver

# Conflicts:
#	javascript/src/Main.js
parents 167b3dc0 b6866fa0
No related branches found
No related tags found
Loading
Showing
with 65 additions and 41 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