You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
asciinema.org/app/assets
Marcin Kulik c4f40322ed Merge branch 'master' into comments
* master:
  Display asciicast author and creation time
  Claiming asciicasts
  User#add_user_token
  Asciicast.assign_user
  User tokens for assigning asciicasts to users
  Better styles + pagination

Conflicts:
	app/models/asciicast.rb
	db/schema.rb
	spec/factories/asciicasts.rb
	spec/factories/users.rb
13 years ago
..
images Fresh Rails 3.1 app with DM 1.2 and RSpec 2.7 13 years ago
javascripts Simplify comments_index.js 13 years ago
stylesheets Merge branch 'master' into comments 13 years ago