Category
sel
Merge remote-tracking branch 'origin/master'

Conflicts:
	TCMSProject/TCMSProject/TCMS.Web.csproj
	TCMSProject/tcmsDAL/App.config
Merge branch 'master' of https://github.com/tubitcode/TCMS

Conflicts:
	TCMSProject/tcmsDAL/App.config