An error occurred fetching the project authors.
  1. 21 Jun, 2017 1 commit
  2. 19 Jun, 2017 1 commit
  3. 06 Jun, 2017 1 commit
  4. 30 May, 2017 1 commit
  5. 24 May, 2017 1 commit
  6. 18 May, 2017 3 commits
  7. 15 May, 2017 2 commits
  8. 28 Apr, 2017 1 commit
  9. 19 Apr, 2017 1 commit
  10. 11 Apr, 2017 3 commits
  11. 02 Apr, 2017 2 commits
  12. 31 Mar, 2017 3 commits
  13. 30 Mar, 2017 2 commits
  14. 23 Mar, 2017 1 commit
  15. 03 Mar, 2017 1 commit
  16. 23 Feb, 2017 4 commits
  17. 03 Feb, 2017 1 commit
  18. 19 Jan, 2017 1 commit
  19. 14 Nov, 2016 1 commit
  20. 10 Nov, 2016 1 commit
  21. 07 Nov, 2016 1 commit
  22. 17 Oct, 2016 1 commit
  23. 15 Oct, 2016 1 commit
  24. 13 Oct, 2016 1 commit
  25. 09 Oct, 2016 1 commit
  26. 30 Aug, 2016 1 commit
    • Sean McGivern's avatar
      Fix resolving conflicts on forks · 1bda1e62
      Sean McGivern authored
      Forks may not be up-to-date with the target project, and so might not
      contain one of the parent refs in their repo. Fetch this if it isn't
      present.
      1bda1e62
  27. 25 Aug, 2016 1 commit
    • Sean McGivern's avatar
      Handle non-UTF-8 conflicts gracefully · 44eb3197
      Sean McGivern authored
      These can't be resolved in the UI because if they aren't in a UTF-8
      compatible encoding, they can't be rendered as JSON. Even if they could,
      we would be implicitly changing the file encoding anyway, which seems
      like a bad idea.
      44eb3197
  28. 12 Aug, 2016 1 commit