Merge branch 'master' of github.com:MagicBees/MagicBees

Browse Source

Conflicts:
	src/main/java/magicbees/main/utils/MoonPhase.java

...

This commit is contained in:

MysteriousAges committed 2015-05-19 23:12:09 -07:00

2 parents 1c5d255f58 4f41f39f92

commit 7a028787c5

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available