junction/.gitignore, branch mainConnect people through any URL #pluginhttps://git.r.bdr.sh/junction/atom/.gitignore?h=main2020-09-27T16:52:40ZBuild system2020-09-27T16:52:40Zrknolrknol@MacBook-Pro-2.fritz.box2020-09-27T16:52:40Zurn:sha1:e3dca99b9461e2b0fc8f918e6ec2b5212060a8acMerge branch 'main' into 'server'2020-09-27T16:08:37ZRubén Beltran del Río954000-rbdr@users.noreply.gitlab.com2020-09-27T16:08:37Zurn:sha1:ac259c8645783dcb92fc0eafff166769f5216aa9
# Conflicts:
# .gitignoreFirst implementation of the socket server2020-09-27T15:38:43Zrknolrknol@MacBook-Pro-2.fritz.box2020-09-27T15:38:43Zurn:sha1:ed9f8fd50086439ff3de12092af2f813763ada91Merge branch 'rbdr-setup-extension' into main2020-09-27T15:33:19ZRuben Beltran del Rioruben@unlimited.pizza2020-09-27T15:33:19Zurn:sha1:98342562bd88eccdb4eaeecacf866996b64ce974Add firefox extension2020-09-27T15:31:21ZRuben Beltran del Rioruben@unlimited.pizza2020-09-27T15:31:21Zurn:sha1:1ed219c8314a0ca1b95ef8593bb608b7659c87a3Add a gitignore file2020-09-27T14:00:09Zrknolrknol@MacBook-Pro-2.fritz.box2020-09-27T14:00:09Zurn:sha1:d75b263c0b08ac7c729cc7bb98df99f3c4ec6ab4