Commit graph

3 commits

Author SHA1 Message Date
Martin Aeschlimann d78d88f7a8 make merge-conflic serverless 2020-06-12 11:03:52 +02:00
Johannes Rieken b0787a2b87 fix webpack entries for merge-conflict and search-rg 2018-09-20 09:59:24 +02:00
Johannes Rieken 3053689bb5 webpack merge-conflict #57680 2018-09-19 15:19:51 +02:00