diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-11-03 16:23:41 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-11-03 16:23:41 +0100 |
commit | e3f498e6211d8518f10c674ce347ab11d92c0e28 (patch) | |
tree | dc47e95c6407989185d9bfd91297dea791f7721b /nxproxy | |
parent | 1c6c9c04b56656d9ab3f486738a4950e71f29b74 (diff) | |
parent | bd25453bd41957079c7516adf407b8785ef22f1f (diff) | |
download | nx-libs-e3f498e6211d8518f10c674ce347ab11d92c0e28.tar.gz nx-libs-e3f498e6211d8518f10c674ce347ab11d92c0e28.tar.bz2 nx-libs-e3f498e6211d8518f10c674ce347ab11d92c0e28.zip |
Merge branch 'Ionic-bugfix/fix-X-cookie-on-osx' into 3.6.x
Attributes GH PR #543: https://github.com/ArcticaProject/nx-libs/pull/543
Diffstat (limited to 'nxproxy')
0 files changed, 0 insertions, 0 deletions