Commit graph

2 commits

Author SHA1 Message Date
Luke Rogers
aa8ab33ccb Merge branch 'develop' into refresh
Conflicts:
	core/config.py
	plugins/util/color.py
	plugins/util/formatting.py
2013-11-27 16:55:04 +13:00
Luke Rogers
7dc1daa69f move lib to core, no more sys.path fucking @cybojenix 2013-10-02 12:01:46 +13:00