update merge from master

This commit is contained in:
Matthew Dillon 2015-07-13 16:32:03 -08:00
commit f295082592
88 changed files with 771 additions and 675 deletions

View file

@ -0,0 +1,4 @@
import Ember from 'ember';
import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
export default Ember.Route.extend(AuthenticatedRouteMixin);

View file

@ -0,0 +1,3 @@
<div class="about">
<p>This is some information about clostridium.info</p>
</div>