summaryrefslogtreecommitdiff
path: root/app/assets/images
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2014-03-05 21:36:34 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2014-03-05 21:36:34 -0500
commit91e8c1366f101837519b7dd1e5fa7b53473eb97b (patch)
tree92d86e4458d8a380129e370835e3ddf8d5a00dee /app/assets/images
parent11b6cab4a9a7d14e6b58c6a16f471aabaa42247f (diff)
parentf72b55ce938a14313091a92d84c4083c3ba4f2fd (diff)
Merge branch 'clean'
Conflicts: app/controllers/users_controller.rb app/views/users/show.json.jbuilder db/migrate/20140306014123_add_index_to_users_email.rb db/migrate/20140306014125_add_index_to_users_user_name.rb db/migrate/20140306014128_add_password_digest_to_users.rb db/migrate/20140306014130_add_remember_token_to_users.rb db/schema.rb
Diffstat (limited to 'app/assets/images')
0 files changed, 0 insertions, 0 deletions