Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/ArcherSys/ArcherSys
Conflicts: core/components/bower_components/TemplateBinding/src/TemplateBinding.js core/components/bower_components/URL/url.js core/components/bower_components/polymer/bower.json core/components/bower_components/polymer/package.json core/components/bower_components/polymer/src/lib/url.js core/components/bower_components/polymer/test/html/url.html core/components/bower_components/webcomponentsjs/bower.json core/components/bower_components/webcomponentsjs/package.json core/components/bower_components/webcomponentsjs/src/CustomElements/observe.js core/components/bower_components/webcomponentsjs/src/ShadowDOM/querySelector.js core/components/bower_components/webcomponentsjs/src/ShadowDOM/wrappers.js core/components/bower_components/webcomponentsjs/src/ShadowDOM/wrappers/Document.js core/components/bower_components/webcomponentsjs/src/ShadowDOM/wrappers/Element.js core/components/bower_components/webcomponentsjs/src/ShadowDOM/wrappers/Node.js core/components/bower_components/webcomponentsjs/src/ShadowDOM/wrappers/SVGElement.js core/css/desktop.css core/css/images/ui-icons_222222_256x240.png core/css/jquery-ui.structure.css core/css/jquery-ui.structure.min.css core/css/jquery-ui.theme.css core/css/jquery-ui.theme.min.css core/css/login.css core/css/registerstyles.css core/css/start.css core/css/start2.css core/js/.archersysos.js.swp core/js/archersysos.js core/js/archersysos.js~ core/js/battery.js core/js/notidar-amd.js core/js/notidar.js core/neokit-loader.js
- Loading branch information