~arashad.ahamad/duplicity/duplicity

Viewing all changes in revision 1234.

  • Committer: ken
  • Date: 2016-07-31 12:18:15 UTC
  • Revision ID: ken-20160731121815-764wbksgwn1bb2xh
* Fixed conflict in merge from Martin Wilck and applied
  - https://code.launchpad.net/~mwilck/duplicity/0.7-series/+merge/301492
  - merge fixes setsid usage in functional testing.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: