vrde 641e8ac82d Merge remote-tracking branch 'origin/master' into piece-detail-mediaplayer ...

Conflicts:
	js/components/edition.js
	js/mixins/inject_in_head_mixin.js

2015-06-03 17:44:13 +02:00

..

actions

Add support for videos and images

2015-06-03 16:53:27 +02:00

components

Merge remote-tracking branch 'origin/master' into piece-detail-mediaplayer

2015-06-03 17:44:13 +02:00

constants

resolve cluster-merge-fuck

2015-06-02 17:32:38 +02:00

fetchers

resolve cluster-merge-fuck

2015-06-02 17:32:38 +02:00

mixins

Merge remote-tracking branch 'origin/master' into piece-detail-mediaplayer

2015-06-03 17:44:13 +02:00

models

add checkbox select functionality

2015-06-01 14:10:11 +02:00

stores

resolve cluster-merge-fuck

2015-06-02 17:32:38 +02:00

utils

resolve cluster-merge-fuck

2015-06-02 17:32:38 +02:00

alt.js

Add jQuery to index.html

2015-05-20 11:23:50 +02:00

app.js

Refactor fetch

2015-06-01 17:43:38 +02:00

routes.js

refactor routes

2015-06-01 09:05:30 +02:00