Merge branch 'master' into v1.xx

Conflicts:
	41_snapshots-btrfs
This commit is contained in:
Antynea
2015-08-29 18:17:42 +02:00

View File

@@ -1,3 +1,5 @@
[![GitHub release](https://img.shields.io/github/release/Antynea/grub-btrfs.svg)](https://github.com/Antynea/grub-btrfs)
### grub-btrfs