Merge pull request #8 from OsmosysSoftware/feature-181

author Abijeet <redacted>

Wed, 12 Jul 2017 13:11:35 +0000 (18:41 +0530)

committer GitHub <redacted>

Wed, 12 Jul 2017 13:11:35 +0000 (18:41 +0530)
author Abijeet <redacted>
Wed, 12 Jul 2017 13:11:35 +0000 (18:41 +0530)
committer GitHub <redacted>
Wed, 12 Jul 2017 13:11:35 +0000 (18:41 +0530)
diff --cc resources/assets/js/global.js
Simple merge
diff --cc resources/lang/en/settings.php
Simple merge
		1	2
resources/assets/js/global.js	patch \|	diff1 \|	diff2 \|	blob \| history
resources/lang/en/settings.php	patch \|	diff1 \|	diff2 \|	blob \| history