Stefan Puraner b43d8f18fb Merge branch 'master' of https://github.com/FH-Complete/FHC-Core ...

Conflicts:
	include/dokument_export.class.php
	vendor/FHC-vendor/easyui/demo-mobile/accordion/_content.html
	vendor/FHC-vendor/easyui/demo-mobile/panel/_content.html
	vendor/FHC-vendor/easyui/demo/accordion/datagrid_data1.json
	vendor/FHC-vendor/easyui/demo/combotree/tree_data1.json
	vendor/FHC-vendor/easyui/demo/datagrid/datagrid_data1.json
	vendor/FHC-vendor/easyui/demo/layout/datagrid_data1.json
	vendor/FHC-vendor/easyui/demo/layout/propertygrid_data1.json
	vendor/FHC-vendor/easyui/demo/propertygrid/propertygrid_data1.json
	vendor/FHC-vendor/easyui/demo/tabs/_content.html
	vendor/FHC-vendor/easyui/demo/tabs/tree_data1.json
	vendor/FHC-vendor/easyui/demo/tooltip/_content.html
	vendor/FHC-vendor/easyui/demo/tree/tree_data1.json
	vendor/FHC-vendor/easyui/themes/bootstrap/datalist.css
	vendor/easyui/demo-mobile/accordion/_content.html
	vendor/easyui/demo-mobile/panel/_content.html
	vendor/easyui/demo/accordion/datagrid_data1.json
	vendor/easyui/demo/combotree/tree_data1.json
	vendor/easyui/demo/datagrid/datagrid_data1.json
	vendor/easyui/demo/layout/datagrid_data1.json
	vendor/easyui/demo/layout/propertygrid_data1.json
	vendor/easyui/demo/propertygrid/propertygrid_data1.json
	vendor/easyui/demo/tabs/tree_data1.json
	vendor/easyui/demo/tree/tree_data1.json

2015-12-03 11:20:52 +01:00

..

easyui

Merge branch 'master' of https://github.com/FH-Complete/FHC-Core

2015-12-03 11:20:52 +01:00

jquery-tablesorter

merge

2015-12-03 10:49:00 +01:00