Merge branch 'Development-Marlin' into Development

This commit is contained in:
Edward Patel 2015-04-05 20:28:44 +02:00
commit 5360158545

View file

@ -29,9 +29,9 @@ $(function(){
var config = { var config = {
type: 'github', type: 'github',
host: 'https://api.github.com', host: 'https://api.github.com',
owner: 'thinkyhead', owner: 'MarlinFirmware',
repo: 'Marlin', repo: 'Marlin',
ref: 'marlin_configurator', ref: 'Development',
path: 'Marlin/configurator/config' path: 'Marlin/configurator/config'
}; };
/**/ /**/