Skip to content
GitLab
Switch branch/tag
  1. 21 Jun, 2022 1 commit
  3. 05 Jun, 2022 1 commit
  5. 10 Feb, 2022 1 commit
  7. 07 Dec, 2021 1 commit
  9. 28 Oct, 2021 1 commit
  11. 06 Aug, 2021 1 commit
  13. 21 Jun, 2021 1 commit
  15. 04 Mar, 2021 1 commit
  17. 25 Jan, 2021 1 commit
  19. 13 Aug, 2020 1 commit
  21. 12 Aug, 2020 1 commit
  23. 10 Jun, 2020 1 commit
  25. 09 Jun, 2020 1 commit
  27. 05 Feb, 2019 1 commit
  29. 23 Nov, 2018 1 commit
  31. 04 Oct, 2018 1 commit
  33. 10 Jul, 2018 1 commit
  35. 04 Jul, 2018 2 commits
  37. 06 Jun, 2018 1 commit
  39. 27 Mar, 2018 1 commit
  41. 23 Mar, 2018 1 commit
  43. 19 Mar, 2018 1 commit
  45. 01 Mar, 2018 1 commit
  47. 11 Nov, 2017 1 commit
  49. 13 Oct, 2017 1 commit
  51. 11 Oct, 2017 1 commit
  53. 12 Sep, 2017 1 commit
  55. 27 Jun, 2017 1 commit
  57. 22 Jun, 2017 2 commits
  59. 05 Dec, 2016 1 commit
  61. 04 Dec, 2016 1 commit
  63. 31 Oct, 2016 1 commit
  65. 04 Jul, 2016 1 commit
  67. 09 May, 2016 1 commit
  69. 12 Apr, 2016 1 commit
  71. 16 Mar, 2016 2 commits
  73. 23 Feb, 2016 1 commit
    • Apollon Oikonomopoulos's avatar
      No-op merge of upstream/2.2.18 · 0c87674e
      Apollon Oikonomopoulos authored 
      The upstream branch lacks tags for upstream/2.2.16 and
upstream/2.2.18, which however exist in the repository.

Fix this by doing a merge -s ours, so that the tags appear in the
upstream branch history.
      0c87674e