Quantcast

Merge branch 'master' of git.wowinterface.com:TitanPanel-571

Author urnati <urnati101@gmail.com>
Author date 2022-05-19 14:06:04
Author local date 2022-05-19 10:06:04 -0400
Committer urnati <urnati101@gmail.com>
Committer date 2022-05-19 14:06:04
Committer local date 2022-05-19 10:06:04 -0400
Commit cc26de2ba0bcc11d6de3b407172de64be41ac039
Tree 92d266d7edfd1b850c62a8e5fd33259e88dcd508
Parent 18afc87875831910bd4b62e42c064e2a6376f81e
Parent 0506c066b1ba87a6d10ff3546bde6f9501926d6b
Merge branch 'master' of git.wowinterface.com:TitanPanel-571

# Conflicts:
#	Titan/Titan.toc
#	TitanBag/TitanBag.toc
#	TitanClock/TitanClock.toc
#	TitanGold/TitanGold.toc
#	TitanLocation/TitanLocation.toc
#	TitanLootType/TitanLootType.toc
#	TitanPerformance/TitanPerformance.toc
#	TitanRepair/TitanRepair.toc
#	TitanVolume/TitanVolume.toc
#	TitanXP/TitanXP.toc