]> git.proxmox.com Git - mirror_lxc.git/commitdiff
Merge pull request #1639 from brauner/2017-06-23/lxc_2_1_preparations
authorSerge Hallyn <serge@hallyn.com>
Mon, 26 Jun 2017 14:13:47 +0000 (09:13 -0500)
committerGitHub <noreply@github.com>
Mon, 26 Jun 2017 14:13:47 +0000 (09:13 -0500)
confile: prepare for 2.1.

1  2 
src/lxc/conf.c

diff --cc src/lxc/conf.c
Simple merge