Merge branch 'macmini'
# Conflicts:
#	README.md
commit 8c41138548c5a0326ad9bb7ab01ed4602a542273
2 parents 256801d + 84726a4
@haya4 haya4 authored on 5 Oct
Showing 2 changed files
View
.gitignore 0 → 100644
View
README.md