aboutsummaryrefslogtreecommitdiffstats
path: root/status
diff options
context:
space:
mode:
authorLibravatar startx2017 <vradu.startx@yandex.com>2018-08-26 08:15:34 -0400
committerLibravatar startx2017 <vradu.startx@yandex.com>2018-08-26 08:15:34 -0400
commita6555dfa2dc9ad8dc2ea994f64ddd39c07b2d2fa (patch)
tree6ac2ca71d65fd2ce12aa6215ef56d87de9b606b6 /status
parentremoved --ls, --get, --put (diff)
downloadfirejail-a6555dfa2dc9ad8dc2ea994f64ddd39c07b2d2fa.tar.gz
firejail-a6555dfa2dc9ad8dc2ea994f64ddd39c07b2d2fa.tar.zst
firejail-a6555dfa2dc9ad8dc2ea994f64ddd39c07b2d2fa.zip
merge from mainline
Diffstat (limited to 'status')
-rw-r--r--status2
1 files changed, 2 insertions, 0 deletions
diff --git a/status b/status
index 44f9318f8..505a900bb 100644
--- a/status
+++ b/status
@@ -1,3 +1,5 @@
1Aug 26 - merge mainline
2
1Phase 2 3Phase 2
2- Aug 21 4- Aug 21
3- remove --output --libtrace --libtracelog 5- remove --output --libtrace --libtracelog