Merge pull request #21958 from owncloud/systemtags-style

author Thomas Müller <thomas.mueller@tmit.eu>

Thu, 28 Jan 2016 11:54:52 +0000 (12:54 +0100)

committer Thomas Müller <thomas.mueller@tmit.eu>

Thu, 28 Jan 2016 11:54:52 +0000 (12:54 +0100)
author Thomas Müller <thomas.mueller@tmit.eu>
Thu, 28 Jan 2016 11:54:52 +0000 (12:54 +0100)
committer Thomas Müller <thomas.mueller@tmit.eu>
Thu, 28 Jan 2016 11:54:52 +0000 (12:54 +0100)
diff --cc core/js/systemtags/systemtagsinputfield.js
Simple merge
diff --cc core/js/tests/specs/systemtags/systemtagsinputfieldSpec.js
Simple merge
author	Thomas Müller <thomas.mueller@tmit.eu>
	Thu, 28 Jan 2016 11:54:52 +0000 (12:54 +0100)
committer	Thomas Müller <thomas.mueller@tmit.eu>
	Thu, 28 Jan 2016 11:54:52 +0000 (12:54 +0100)
		1	2
core/js/systemtags/systemtagsinputfield.js	patch \|	diff1 \|	diff2 \|	blob \| history
core/js/tests/specs/systemtags/systemtagsinputfieldSpec.js	patch \|	diff1 \|	diff2 \|	blob \| history