Seth Call
f9e02c5707
Conflicts: admin/app/admin/jam_tracks.rb admin/app/views/admin/jam_tracks/_form.html.slim admin/app/views/admin/jam_tracks/_jam_track_track_fields.html.slim admin/config/initializers/jam_tracks.rb db/manifest ruby/lib/jam_ruby.rb ruby/lib/jam_ruby/app/uploaders/jam_track_track_uploader.rb ruby/lib/jam_ruby/jam_tracks_manager.rb ruby/lib/jam_ruby/models/jam_track.rb ruby/lib/jam_ruby/models/jam_track_right.rb ruby/lib/jam_ruby/models/jam_track_track.rb ruby/spec/jam_ruby/models/jam_track_right_spec.rb ruby/spec/jam_ruby/models/jam_track_track_spec.rb ruby/spec/jam_ruby/resque/jam_tracks_builder_spec.rb web/app/assets/javascripts/download_jamtrack.js.coffee web/app/assets/javascripts/globals.js web/app/assets/javascripts/jam_rest.js web/app/assets/javascripts/order.js web/app/assets/javascripts/playbackControls.js web/app/assets/javascripts/session.js web/app/assets/stylesheets/client/session.css.scss web/app/controllers/api_jam_tracks_controller.rb web/app/controllers/api_recurly_controller.rb web/spec/controllers/api_jam_tracks_controller_spec.rb |
||
|---|---|---|
| .. | ||
| environments | ||
| initializers | ||
| locales | ||
| application.rb | ||
| boot.rb | ||
| database.yml | ||
| environment.rb | ||
| logging.rb | ||
| routes.rb | ||
| unicorn.rb | ||