Bug #11904

Merge current devel branch into feature/stretch: 2016-11 edition

Added by intrigeri 2016-11-10 10:44:52 . Updated 2016-11-15 11:05:51 .

Status:
Resolved
Priority:
High
Assignee:
Category:
Target version:
Tails_3.0
Start date:
2016-11-10
Due date:
% Done:

100%

Feature Branch:
Type of work:
Code
Blueprint:

Starter:
Affected tool:
Deliverable for:

Description

Hi! Currently that merge has lots of conflicts in the test suite (that was heavily modified on both sides). IMO one of the first things we should do during next sprint is to handle this.

Subtasks

History

#1 Updated by anonym 2016-11-15 11:05:51

  • Status changed from Confirmed to Resolved
  • Assignee deleted (anonym)
  • % Done changed from 0 to 100
  • QA Check set to Pass