An error occurred fetching the project authors.
  1. 06 Aug, 2020 1 commit
  2. 23 Jul, 2020 1 commit
  3. 13 Jul, 2020 1 commit
  4. 30 Apr, 2020 1 commit
  5. 25 Mar, 2020 1 commit
  6. 30 Sep, 2019 1 commit
  7. 12 Dec, 2018 1 commit
    • Yorick Peterse's avatar
      Reinstate changes lost due to automatic merging · 749ebc1c
      Yorick Peterse authored
      The automatic merging code used `--strategy=ours`, which turned out to
      be incorrect; instead we wanted `--strategy=recursive
      --strategy-option=ours`. This small difference results in merging
      throwing away _all_ EE changes in favour of CE changes, instead of only
      doing this for conflicts.
      
      This commit ensures that EE has all the appropriate changes. The diff
      was generated by cherry picking all merge commits made since two days
      ago, picking them with `--strategy=recursive --strategy-option=ours`.
      749ebc1c
  8. 07 Dec, 2018 1 commit
  9. 13 Nov, 2018 1 commit
  10. 21 Jun, 2018 1 commit
  11. 28 Dec, 2015 2 commits