-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'development' of https://github.com/Dash-Industry-Forum/…
- Loading branch information
Showing
106 changed files
with
6,409 additions
and
1,012 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,53 +1,68 @@ | ||
{ | ||
"items": [ | ||
{ | ||
"name": "Digital Primates", | ||
"logo": "app/img/dp.png", | ||
"link": "http://www.digitalprimates.net" | ||
}, | ||
{ | ||
"name": "Akamai", | ||
"logo": "app/img/akamai.png", | ||
"link": "http://www.akamai.com" | ||
}, | ||
{ | ||
"name": "Microsoft Open Technologies", | ||
"logo": "app/img/MSOpenTech.jpg", | ||
"link": "http://msopentech.com" | ||
}, | ||
{ | ||
"name": "Fraunhofer Fokus", | ||
"logo": "app/img/fh_fokus.png", | ||
"link": "https://www.fokus.fraunhofer.de/go/fame" | ||
}, | ||
{ | ||
"name": "CableLabs", | ||
"logo": "app/img/cablelabs.png", | ||
"link": "http://www.cablelabs.com" | ||
}, | ||
{ | ||
"name": "YouTube", | ||
"logo": "app/img/youtube.png", | ||
"link": "http://www.youtube.com" | ||
}, | ||
{ | ||
"name": "Senthil", | ||
"link": "https://github.com/senthil-codr" | ||
}, | ||
{ | ||
"name": "Brightcove", | ||
"logo": "app/img/brightcove.png", | ||
"link": "https://www.brightcove.com" | ||
}, | ||
{ | ||
"name": "Edgeware", | ||
"logo": "app/img/edgeware.png", | ||
"link": "http://www.edgeware.tv/" | ||
}, | ||
{ | ||
"name": "Epic Labs", | ||
"logo": "app/img/epiclabs.png", | ||
"link": "https://www.epiclabs.io/" | ||
} | ||
] | ||
"items": [ | ||
{ | ||
"name": "Digital Primates", | ||
"logo": "app/img/dp.png", | ||
"link": "http://www.digitalprimates.net" | ||
}, | ||
{ | ||
"name": "Akamai", | ||
"logo": "app/img/akamai.png", | ||
"link": "http://www.akamai.com" | ||
}, | ||
{ | ||
"name": "Microsoft Open Technologies", | ||
"logo": "app/img/MSOpenTech.jpg", | ||
"link": "http://msopentech.com" | ||
}, | ||
{ | ||
"name": "Fraunhofer Fokus", | ||
"logo": "app/img/fh_fokus.png", | ||
"link": "https://www.fokus.fraunhofer.de/go/fame" | ||
}, | ||
{ | ||
"name": "CableLabs", | ||
"logo": "app/img/cablelabs.png", | ||
"link": "http://www.cablelabs.com" | ||
}, | ||
{ | ||
"name": "YouTube", | ||
"logo": "app/img/youtube.png", | ||
"link": "http://www.youtube.com" | ||
}, | ||
{ | ||
"name": "Senthil", | ||
"link": "https://github.com/senthil-codr" | ||
}, | ||
{ | ||
"name": "Brightcove", | ||
"logo": "app/img/brightcove.png", | ||
"link": "https://www.brightcove.com" | ||
}, | ||
{ | ||
"name": "Edgeware", | ||
"logo": "app/img/edgeware.png", | ||
"link": "http://www.edgeware.tv/" | ||
}, | ||
{ | ||
"name": "Epic Labs", | ||
"logo": "app/img/epiclabs.png", | ||
"link": "https://www.epiclabs.io/" | ||
}, | ||
{ | ||
"name": "National University of Singapore", | ||
"logo": "app/img/National_University_of_Singapore_logo_NUS.png", | ||
"link": "https://nus.edu.sg/" | ||
}, | ||
{ | ||
"name": "Özyeğin University", | ||
"logo": "app/img/OzU_logo_eng.png", | ||
"link": "https://www.ozyegin.edu.tr/" | ||
}, | ||
{ | ||
"name": "Unified Streaming", | ||
"logo": "app/img/US-logo-petrol-rgb.jpg", | ||
"link": "https://www.unified-streaming.com/" | ||
} | ||
] | ||
} |
Oops, something went wrong.