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		2012-03-04 21:14:35 +01:00
..
asciicasts.rb	Merge branch 'master' into comments	2012-03-04 21:14:35 +01:00
comments.rb	Add comment resource	2012-03-04 13:50:16 +01:00
user_tokens.rb	Claiming asciicasts	2012-03-04 20:30:26 +01:00
users.rb	User tokens for assigning asciicasts to users	2012-03-04 18:14:58 +01:00