Merge branch 'master' into new-build-header

This commit is contained in:
Lisa Passing 2015-03-11 13:05:43 +01:00
commit 436fd7e923
5 changed files with 5 additions and 184011 deletions

3
.gitignore vendored
View File

@ -13,3 +13,6 @@ coverage/*
libpeerconnection.log libpeerconnection.log
npm-debug.log npm-debug.log
testem.log testem.log
# files generated by older build tools
public/scripts

View File

@ -1,6 +1,7 @@
`import Ember from 'ember'` `import Ember from 'ember'`
`import BasicView from 'travis/views/basic'`
View = Ember.View.extend View = BasicView.extend
templateName: 'jobs' templateName: 'jobs'
buildBinding: 'controller.build' buildBinding: 'controller.build'

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff