Airtime
  1. Airtime
  2. CC-3393

Merge 2.0.x branch into devel

      Details

      • Type: Task Task
      • Status: Closed Closed
      • Priority: Minor Minor
      • Resolution: Fixed
      • Affects Version/s: None
      • Fix Version/s: 2.1.0
      • Component/s: Development Environment
      • Labels:
        None

        Description

        Just tried this and there are a lot of conflicts. Reverted by using git reset --merge
        These conflicts are due to major changes happening in both branches to the same files (pypo being merged with show-recorder in 2.0.x).

          Activity

          Ascending order - Click to sort in descending order
          Martin Konecny           made changes -
          Field Original Value New Value
          Status Open [ 1 ] Resolved [ 5 ]
          Assignee Martin Konecny [ mkonecny ]
          Resolution Fixed [ 1 ]
          Martin Konecny           made changes -
          Implemented by mkonecny
          Component/s Development Environment [ 10063 ]
          Mikayel Karapetyan           made changes -
          Status Resolved [ 5 ] Closed [ 6 ]

            People

            • Assignee:
               Unassigned
              Reporter:
               Martin Konecny
              Implemented by:
              Martin Konecny
            • Votes:
              0 Vote for this issue
              Watchers:
              0 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: