Christian Boltz 509f56e22c Merge branch 'cboltz-postalias' into 'master' ... allow locking /etc/aliases.db See merge request apparmor/apparmor!250 Acked-by: intrigeri <intrigeri@debian.org> (cherry picked from commit 473d1f5daa) f74edd5d allow locking /etc/aliases.db		2018-10-26 14:40:04 +00:00
..
apparmor/profiles/extras	Merge branch 'cboltz-postalias' into 'master'	2018-10-26 14:40:04 +00:00
apparmor.d	Revert "profiles: support distributions which merge sbin into bin"	2018-10-21 13:32:07 +02:00
Makefile	Merge branch 'test-includes' into 'apparmor-2.12'	2018-10-18 17:15:07 +00:00