Mirrors/remote-jobs
2
0
Fork 0
mirror of https://github.com/remoteintech/remote-jobs synced 2024-12-27 21:03:10 +00:00
Code Issues Projects Releases Packages Wiki Activity
1077 commits 2 branches 0 tags 10 MiB
Commit graph

801 commits

Author SHA1 Message Date
Doug Aitken
2a259bad2b Remove 45Royale (#725) 
* Remove 45Royal from Readme

* delete 45Royale profile
 2020-02-08 20:30:16 +00:00
Daiane Souza
2426a46625
Add Lyseon Tech (#720) 
* Create LyseonTech

* Delete LyseonTech

* Create lyseontech.md

* Update README.md

* Update lyseontech.md

* added expected dash in file name

`lyseontech.md` to `lyseon-tech.md`

* updated readme entry for lyseon-tech.md

Co-authored-by: Doug Aitken <dougaitken@users.noreply.github.com>
 2020-02-05 18:48:43 +00:00
Jose Antonio Dorado
867d8c92c0
Add GuideSmiths (#718) 2020-02-05 18:29:33 +00:00
Dan J Miller
835de17d01
Add MetaMask (#716) 2020-01-29 11:47:55 +00:00
Jesus Aguilera
ae20240057 Add ALICE (#714) 
* Adding ALICE

* Small fixes and typos

* Adjusted company Blurb

* Added blockquote for Jesus' quote
 2020-01-16 10:44:44 +00:00
Ben Serviss
5b85a260b3 Add BeenVerified, LTV (#713) 2020-01-14 11:30:31 +00:00
Jean Hadrien Chabran
46babf5cc4 Add Heetch (#712) 2020-01-04 18:09:20 +00:00
Hannah Zulueta
d440160f9c Add company info for Carbon Black (#691) 
* Add company info for Carbon Black

* Update readme to remove emoji

* Rename company name

* added correect name again

* changed name back to Carbon Black
 2019-12-13 13:24:45 +00:00
Doug Aitken
543e9b059d Merge branch 'mediavine' of https://github.com/nicolepdev/remote-jobs into nicolepdev-mediavine 2019-12-13 12:48:04 +00:00
Doug Aitken
6bfeeb267c fix links in readme for mediavien and medium 2019-12-13 12:41:35 +00:00
Doug Aitken
dc2c0b1580 resolve readme conflict 2019-12-13 11:52:06 +00:00
Doug Aitken
1eb78f9fec added link to profile in readme 2019-12-13 11:48:09 +00:00
BrunoLM
a47801cd4e Add AE Studio (#708) 
* Add AE Studio

* Fix format

* Fix size

* Fix remote

* Fix title and order

* Fix

* capital H

GitHub not Github
 2019-12-13 11:17:56 +00:00
Don MacAskill
e3ba463ef4 Improve SmugMug’s company blurb (#704) 
* Improve SmugMug’s company blurb

Adds extra context to SmugMug’s listing, adhereing to the Contributing Guidelines and Code of Conduct.

I am the co-founder, CEO & Chief Geek at SmugMug. We love remote workers.

* Remove warning emoji

Also tighten up language and markdown.
 2019-11-22 15:26:41 +00:00
Karl Becker
53a0b0313c Add Third Iron (#703) 
* Add third-iron.md

* Update README.md

* Fix link to third-iron.md
 2019-11-22 15:00:19 +00:00
Chris van Dal
9d282df147 added octopus deploy (#701) 2019-11-20 10:07:08 +00:00
Brian Faust
a39dea7e60 Add ARK (#699) 2019-11-19 17:37:31 +00:00
chrisr-ifit
61cedba8bb Adds iFit (#700) 
* Adds iFit

* add missing comma
 2019-11-19 17:36:32 +00:00
Brian Bennett
72c1638e58 Add Joyent (#688) 2019-11-07 09:50:45 -05:00
Carlos Kelly
249956ff96 Add Formidable to Remote Jobs (#698) 2019-11-06 13:11:20 +00:00
Diego Gallegos
2a51ec4565 Add www.xapo.com (without code editor files) (#693) 
* added xapo.com

* modify .gitignore to ignore code editor files

* remove .gitignore for code editor files
 2019-11-04 19:37:11 +00:00
Fabiana Ferlin
1dc39e07e6 Update profile for Wombat Security Technologies (#644) 2019-11-01 00:02:22 -04:00
Hannah Zulueta
8d186c5264 Add company info for Bebanjo (#689) 2019-10-31 23:52:37 -04:00
anthonypleshek
c966ece11e Add info for Datica (#661) 2019-10-31 23:44:21 -04:00
abc516
15b1cd86fa add Scalac info (#692) 
* add Scalac info

* add md file for scalac

* rename scalac md file
 2019-10-31 13:54:03 +00:00
Hannah Zulueta
56114821b2 Add company info for betable (#690) 
* Add betable info

* Update readme

* Remove emoji from readme
 2019-10-31 13:49:21 +00:00
Saptarshi Gan
60f5d0d3c1 Update gitbook desc (#685) 
* Update gitbook.md

There isn't much mention about completely remote-only positions

* Update README.md

update gitbook desc
 2019-10-31 13:47:28 +00:00
Phawin Khongkhasawan
c2dd3172ec Add Bairesdev company (#683) 
* Add bairesdev company

* Add bairesdev to readme

* Correct order

* Correct order
 2019-10-29 14:48:43 +00:00
Dani Kellogg
f9392515f8 Update Knack URL to current domain (#682) 
Knack's previous domain was knackhq.com and was switched to knack.com
 2019-10-28 12:24:46 +00:00
Keegan Osler
d50758fc1e Add graylog (#680) 
* edit page for rebelmouse

* remove rebelmouse emoji from readme.md

* add info about web dev studios

* remove web dev studios emoji from readme

* add info to bizink.md

* remove emoji for bizink from readme

* edit bizink.md for clarity

* add info about graylog

* remove graylog emoji from readme

* add Graylog location to readme
 2019-10-28 12:23:08 +00:00
ScientiaSitPotentia
5c2bb9de14 Added Medium.com (#684) 
* Added Medium to Companies list

* Create medium.md

* Update medium.md

Added company details
 2019-10-28 12:22:29 +00:00
kamil
5bdb027558 Issue # 575: Add cabify company to the list (#669) 
* Issue # 575: Add cabify company to the list

* Update Readme.md file
 2019-10-25 12:30:36 +01:00
Keegan Osler
5918efe72f Add bizink (#679) 
* edit page for rebelmouse

* remove rebelmouse emoji from readme.md

* add info about web dev studios

* remove web dev studios emoji from readme

* add info to bizink.md

* remove emoji for bizink from readme

* edit bizink.md for clarity
 2019-10-25 12:12:14 +01:00
dangrous
9f2f775436 Add Alley to list (#678) 
* add alley to list

* fix linking

* add alley.md

* Revert "add alley.md"

This reverts commit 3dbd44ccd8.

* Create alley.md
 2019-10-25 12:11:14 +01:00
Gabriel Boorse
9d8944be5c add Functionize (#677) 2019-10-25 11:55:28 +01:00
Muhammad Noman
401ef9f006 added Komoot in remote companies list (#676) 
* Create komoot.md

* added Komoot in the remote companies list
 2019-10-25 11:54:51 +01:00
Grzegorz Domaradzki
49c050375d update Netguru.md (#672) 
* Updated netguru.md

* Update README.md
 2019-10-25 11:44:09 +01:00
Ariel Jiménez
7fed9c7416 Add X-team info (#655) 2019-10-25 11:41:28 +01:00
Kevin Gallardo
89770d3ebb Add DataStax remote description. (#652) 2019-10-25 11:39:54 +01:00
Rahul Jain
25757d2ed3 Anomali profile (#651) 
* Update anomali.md

* Update anomali info in README.md

* update careers link

* update office locations

* update region

* update remote status and how to apply

* update how to apply
 2019-10-25 11:37:10 +01:00
Santi
408d79abb2 Add PrivacyCloud (#649) 2019-10-25 11:33:50 +01:00
Spencer Davies
59f8d5b204 Complete information for Inpsyde (#657) 2019-10-24 19:42:57 +00:00
Valentin Radulescu
67528bf9ce Add Memory (#618) 2019-10-24 19:39:29 +00:00
Rasul Kireev
d5cabb33e8 Remove Happy Bear Software (#670) 2019-10-24 19:38:35 +00:00
Keegan Osler
66f885b61f Add webdevstudios (#667) 
* edit page for rebelmouse

* remove rebelmouse emoji from readme.md

* add info about web dev studios

* remove web dev studios emoji from readme
 2019-10-22 19:32:54 +01:00
Paige A.C. Berry
19c8cd5cc6 Add data to Trello entry (#648) 2019-10-21 07:07:59 +00:00
Jakob
b0be632472 Remove Azoola (#643) 
Their website is no longer online.
 2019-10-21 07:05:30 +00:00
Olivia Ng
5ce2591532 Add Groove (#646) 
Closes #390.
 2019-10-21 07:04:35 +00:00
Vincent Dörig
cd75382f8a Add Filament Group (#642) 
* Add Filament Group

* Remove ⚠️️ and add location

* Improve how to apply message
 2019-10-21 06:59:50 +00:00
Jakob
908b41f340 Fill in company profile for Hanno (#641) 2019-10-21 06:58:32 +00:00
Vincent Dörig
6a594c7f0e Add Docker (#640) 2019-10-21 06:57:21 +00:00
Aman Mittal
7f2cc9770b Add Instamobile reference (#632) 2019-10-21 06:39:34 +00:00
Spencer Davies
aa5db79a44 Add WalletHub (#638) 2019-10-15 05:15:26 +00:00
RickNln
521f0e5f2f Add Evrone (#635) 2019-10-14 18:28:35 +00:00
isaac-debug
d72784cc26 Add TeamUltra (#629) 2019-10-14 18:24:22 +00:00
Gabriel Ferreira
335e64a83d Add iClinic (#625) 2019-10-14 18:23:20 +00:00
Guilherme Guerra
045e6db7fb Removes Citrusbyte (#620) 
* Removes Citrusbyte

* Removes citrusbyte company profile
 2019-10-07 19:37:23 -04:00
Mark Rushakoff
a67cdf3520 Update profile for InfluxData (#617) 2019-09-28 05:31:54 +00:00
Robson de Almeida
ee2de5ab50 Add Superplayer & Co (#614) 2019-09-20 05:32:36 +00:00
manuelbcd
dc9f7e8a8b Add DareCode (#612) 2019-09-20 05:31:28 +00:00
Robin
d97e8b4e19 Add Roadtrippers (#615) 2019-09-17 22:14:32 -05:00
Yusuf Goksu
2cd752bb50 Update Algorithmia region (#610) 2019-09-17 22:07:42 -05:00
Angela Ambroz
0f08b8877d Add Optoro (#611) 2019-09-16 00:16:57 -05:00
Stan
545a3caa58 Add CloudApp (#609) 2019-09-15 22:43:35 -05:00
Patrick O'Sullivan
e7cd83dda3 Add profile for Headway (#606) 
* add headway profile

* adjust titles

* Add headway to companies list

* switch elixir and node

* update region
 2019-08-29 07:46:37 +01:00
Zoey Zou
6269a19ddd Add Pleo (#604) 2019-08-27 14:44:11 +01:00
Phil Freo
c3235bf922 We dropped the .io (#605) 
* We dropped the .io

* Update README.md

* Rename close-io.md to close.md
 2019-08-23 15:33:20 +01:00
carojacob
7c582cbea2 Add OpenZeppelin (#599) 2019-08-13 06:27:56 +00:00
elishowk
aa58a45621 Add Comet (#600) 2019-08-11 07:38:00 +00:00
Chris Crocker-White
6a68ae51bb Add Balena (#601) 
Change-type: patch
Signed-off-by: Chris Crocker-White <chriscw@balena.io>
 2019-08-11 07:00:14 +00:00
Vince Speelman
a04a3dd62c Update ted.md (#598) 
* Update ted.md

* Update README.md
 2019-08-07 17:05:21 +01:00
Ardy Malihi
9ae535e6ca Add Blameless Company Profile (#594) 
* add blameless company info

* add Blameless to the list
 2019-07-25 08:05:42 +01:00
abiturma
db029af591 Add entry and profile for abiturma (Ger) (#595) 2019-07-25 08:04:56 +01:00
Lewis
6ebd0ac0b9 Adding Fauna; updating gitignore (#591) 2019-07-25 07:58:49 +01:00
JCKim
f29be8cb66 Update Spoqa information (#590) 2019-07-15 18:31:49 +01:00
JCKim
4dea3eadc9 Add LINE Plus Corporation (#589) 
* Add LINE Plus Corporation

* Change the name to line-plus-corporation
 2019-07-15 18:30:54 +01:00
Preston Roberts
a08fd34d3a adding company profile for BTownWeb (#585) 2019-07-11 13:10:07 +01:00
Mark Ferlatte
224189dc3b Add TrussWorks (#583) 2019-06-26 04:38:14 +00:00
Gant Laborde
5ebd22c722 Adding Infinite Red (#578) 
* Add Infinite Red

* Create infinitered.md

* cleanup

* Rename infinitered.md to infinite-red.md

* Update README.md
 2019-06-11 15:46:59 +01:00
Alexander Soto
d792ead697 Add Interview Schedule (#577) 2019-06-11 15:45:39 +01:00
Federico Saravia
a51b2f4a3e Add Theorem (#574) 2019-06-07 09:14:17 +01:00
Caleb Collins-Parks
dce21b449d update 15five region (#572) 
* update 15five region

we are hiring people in central / south america now too.

* update 15Five region
 2019-06-06 17:58:14 +01:00
cryptononymous
205cd7087e Create kraken.md (#571) 
* Create kraken.md

* Update README.md
 2019-06-06 15:01:29 +01:00
Davi Alexandre
8978bf207a Add Compucorp (#570) 2019-05-31 12:00:59 +01:00
mrcflorian
cf23712da5 Add iOS App Templates (#555) 2019-05-25 16:48:54 +00:00
Willem Wijnans
0c440c5b11 Fix Aula profile (#561) 2019-05-25 16:42:08 +00:00
Maureen E. Mirville
915e000673 Add Best Practical Solutions (#568) 
* Add Best Practical Solutions

* Update Best Practical Solutions company profile name
 2019-05-22 14:34:40 +01:00
Robert Shedd
01226ce6e2 adding RenoFi! (#567) 2019-05-17 09:50:53 +01:00
CXA-Cobi
365d9c4b90 Connexa (#566) 
* added connexa

* added connexa

* fix readme

* update remote status description
 2019-05-16 17:09:08 +01:00
Yani Iliev
67caf1cf6c Add ServMask (#564) 2019-05-08 04:24:10 +00:00
Aaron Stanush
11209ce710 Update Four Kitchens profile (#562) 2019-05-03 14:40:49 -05:00
Caleb Collins-Parks
bef658c0ca Add 15Five (#563) 2019-05-03 14:37:52 -05:00
Emre Sokullu
bd61b1f746 added Grou.ps (#558) 
* added Grou.ps

* bugfix

* bugfix
 2019-04-26 01:18:41 -05:00
Jayson Virissimo
a09b8e56de Add Tuft & Needle (#556) 2019-04-22 10:29:12 +01:00
Chris Lankford
8661e11ca1 Clankford patch 1 (#557) 
* Added NEXT

Added NEXT to the list of companies

* Company profile for NEXT

Added details about the company.
 2019-04-22 10:18:35 +01:00
Berta Devant
fee59be395 add over to company and index (#549) 2019-04-10 16:59:09 +02:00
Ross Fairbanks
3f202d28f7 Add company profile for Giant Swarm (#547) 
* Add company profile for Giant Swarm

* Update region text to just Europe.

* Updated company blurb

* Fix typo
 2019-03-28 13:30:42 +00:00
Doug Sheffer
532c2229af Update Research Square details (#545) 2019-03-25 10:17:13 +00:00
Felipe Vieira
3cf3c89a30 Add ChefsClub (#543) 2019-03-20 15:18:19 -05:00
Or Duan
7d0995c2f7 Add BeyondPricing (#542) 2019-03-10 22:18:31 -05:00
Vangelis Katsikaros
06e3338c59 Add Adzuna to the list (#540) 
Signed-off-by: Vangelis Katsikaros <vkatsikaros@gmail.com>
 2019-03-07 11:24:07 +00:00
Brent Anderson
218ff13385 Add Lambda School (#538) 2019-02-27 22:30:00 -05:00
Jason Skowronski
55e2f4480f Adding Dev Spotlight to the list (#539) 2019-02-27 22:28:55 -05:00
MasumCS
d6fcdaa629 Update RealtimeCRM (#537) 2019-02-26 20:26:30 -05:00
marinehb
0a9d5aceed Add Scopic Software to the list (#532) 2019-02-23 23:40:59 -05:00
Robert Niimi
ca145079e9 Added Shogun (#533) 2019-02-20 19:35:30 -05:00
Six Revisions
b4d896aa93 Added WebFX (#531) 2019-02-14 13:23:00 -05:00
Carlos Hernández Medina
e6a573c6e7 Add Quaderno to the list (#529) 2019-02-13 12:34:24 +00:00
Yasen Slavov
8b54e3f322 Add details for BetaPeak (#527) 2019-02-05 23:05:42 -05:00
Geoffrey Dhuyvetters
3e8bb00ca8 Add madewithlove to the companies (#524) 
* Add madewithlove to companies list

* Add madewithlove company profile page
 2019-01-24 07:29:34 +00:00
Edward Muller
6cec37b286 Add info for Heroku (#522) 2019-01-15 20:57:24 -05:00
Radek Simko
2d275c9fbd Update hashicorp.md (#521) 2019-01-14 22:29:11 -05:00
Gavyn McKenzie
f09c3f48f7 Add Etch (#519) 2019-01-07 20:38:26 -05:00
Adam Smith
c211527dd2 Add Mobile Jazz and Bugfender (#516) 2018-12-19 15:11:56 -05:00
Robin Hellemans
6ffc96c7c3 Update README.md (#514) 
* Update README.md

* Update README.md
 2018-12-10 19:25:17 +00:00
Nitya Oberoi
15e810fe74 Update charity-water.md (#513) 
* Update charity-water.md

Added information regarding our organization, details regarding our culture / open positions

* Remove warning symbol, add office locations to readme
 2018-11-26 16:30:00 +00:00
Ernesto Tagwerker
56ed374ca2 Add Ombu Labs, The Lean Software Boutique, to the list (#512) 2018-11-13 22:55:51 -05:00
Amina
1dd1d5b792 Update featurist.md (#509) 
Add a company profile

* Remove exclamation mark on featurist

* Delete "NA"

* Delete sections with no info
 2018-11-10 11:25:01 -05:00
Amina
2de4dced5d Add Arkency company profile (#510) 
* Remove Arkency exclamation mark
 2018-11-10 11:22:17 -05:00
Kevin Mehlbrech
98b3b70c1d Add BetterUp to the list of remote companies (#511) 2018-11-09 20:11:04 -05:00
Robin Hellemans
a68465b5d9 Fix broken link to CareMessage (#508) 2018-11-04 01:02:59 -06:00
Doug Aitken
68650ea95c
remove dramafever (#504) 2018-10-30 11:49:23 +00:00
Amina
1f504d0c20 Change AngularClass to Tipe.io (#501) 
* Change AngularClass to Tipe.io

It seems Angular Class has pivoted to Tipe.io. There isn't much info on their website, so still keeping this as a company profile which needs information.

* Change AngularClass to TIpe.io on README

Read on https://angel.co/tipe/jobs that they are based in San Fran and only hiring there for now.

* Update Tipe.io company profile

I have taken this information from their angel list profile. I am NOT SURE about their remote status. They were on the list as AngularClass, but since their pivot to Tipe.io I can't see any evidence that they're a remote team apart from the fact that they're a group of open source engineers. It's your choice guys if you would like to accept this profile that I've largely inferred from their angel list profile. Totally understand if you prefer not to! Thank you!

* Removing Tipe exclamation mark

Removed Tipe exclamation mark (as updated company profile) and moved into alphabetical order

* Rename angular class to tipe.md in company profile NAME
 2018-10-26 09:33:35 +01:00
Alexis Hernandez
a8b1b2724f Update softwaremill details (#491) 2018-10-20 22:36:05 -05:00
Amina
3ca9d3dc9a Update 45royale.md (#495) 
* Update 45royale.md

* 45royale remove exclamation mark & add region
 2018-10-20 22:33:48 -05:00
Amina
59e23a71de Add Aerolab company profile (#498) 
* Add Aerolab company profile

* Aerolab region add in README
 2018-10-20 22:33:21 -05:00
Alexis Hernandez
053d68c951 Update lightbend details (#492) 2018-10-20 22:21:18 -05:00
Alexis Hernandez
90375d1c1b Add IOHK (#490) 2018-10-20 22:19:13 -05:00
Alexis Hernandez
69fab1b434 Update CircleCI profile (#489) 2018-10-20 22:18:42 -05:00
Aaron Pava
1f1ae96784 Add CivicActions (#486) 2018-10-16 22:55:38 -05:00
Amina
3ae9b9dd13 Update geckoboard.md (#483) 2018-10-16 13:46:54 -05:00
Luís Rodrigues
f8fc001099 Add Equal Experts Portugal (#484) 
* Adds Equal Experts Portugal

* Equal Experts portugal
 2018-10-16 17:13:22 +01:00
James Lloyd
5ac0082e86 add redox (#480) 2018-10-14 21:34:34 -05:00
Luiz F. A. de Prá
24448b6435 Add olist (#477) 2018-10-09 23:14:17 -05:00
MasumCS
ba56e577a3 Add realtimecrm (#476) 
* add-placeholder

* update-readme

* capitals-readme

* realtime-profile
 2018-10-09 11:42:44 +01:00
Fabian Wosar
9cee0b5105 Add Emsisoft (#473) 2018-08-23 20:51:56 -05:00
Huiming Teo
bbe6122106 Update Black Tangent company URLs (#471) 2018-08-16 12:32:29 +01:00
James Nylen
59dba260a7
Remove Word to the Wise (#470) 2018-08-14 23:08:06 -05:00
James Nylen
4ee26500e3
Make the listing site work on Netlify (#460) 2018-08-11 20:41:11 -05:00
Ben Darfler
a65dfb4464 InVision Information (#459) 
Primarily taken from https://www.crunchbase.com/organization/invisionapp
and from job descriptions on https://www.invisionapp.com/company#jobs

However, I do also work there.
 2018-07-25 09:50:58 +01:00
Scott Walton
90a1c630bd Add Hotjar information (#458) 2018-07-23 10:16:41 -05:00
Tai Le
2578f02971 Remove crew.co (#457) 
They no longer accepting remote work under the name crew.co

  Sunsetting Crew

  We’re proud to announce that Crew will now become Dribbble Hiring, a set
  of tools under the Dribbble brand to help you find and hire design and
  front-end development talent.

  After our acquisition last year, we’ve moved on to work side-by-side
  with the Dribbble team to build the future of creative hiring.

  This means we also had a difficult decision to make...

Source: https://crew.co/
 2018-07-23 09:57:08 +01:00
Pavel Bragin
7f33cdc825 Add Soshace LLC to listing of remote jobs (#313) (#454) 
* Add Soshace LLC to listing of remote jobs (#313)

* Complete checklist

Confirm the stuff shared from recruiting matches the checklist and code of conduct.

* Add in Soshace's company profile

* Add Soshace to read me listing

* Add region "Worldwide"

Should be used in the PR

* Changed order of the Soshace company. Also fixed fetlife company

Fixed fetlife, because automatic checking told me to do so
 2018-07-20 13:26:00 -05:00
Austin Songer
ae43651c21 Alight Solutions (#453) 
* Create alightsolutions.md

* Update README.md

* Update README.md

* Rename alightsolutions.md to alight-solutions.md

* Update README.md

* Update big-cartel.md

Changing Big Cartel Job link to proper markdown syntax.

* Update the-ghost-foundation.md

Change to the ghost career link.

* Update fetlife.md

* Update fetlife.md
 2018-07-20 12:55:12 +01:00
machiko
22ba20336a docs: add reaction-commerce.md and add Reaction Commerce to README.md (#452) 2018-07-18 23:39:09 -05:00
Mbroaz
289ef61ae7 Whitespectre's Worldwide location updated in the table (#449) 
* Updated Whitespectre details.

Updated Whitespectre details

* Add Whitespectre Glassdoor link

* Remove ⚠ from Whitespectre

* Updated version with requested changes

* Updated Worldwide location to Whitespectre
 2018-07-09 17:04:45 +01:00
Mbroaz
b845033e3d Add Whitespectre information (#446) 2018-07-03 23:19:16 -05:00
Michael Edelstone
1fec2349aa Adds complete info for a company called Kuali (#447) 2018-07-02 01:26:43 -05:00
James Nylen
cbd3073fd6
Validate whether profiles marked as incomplete are actually incomplete (#443) 2018-06-24 21:42:33 -05:00
Doug Aitken
ae961d411f fixed merge conflict 2018-06-23 08:06:44 +01:00