OSDN Git Service

merging upstream changes
authorSteven Verbeek <dubcanada@gmail.com>
Sat, 24 Mar 2012 03:36:54 +0000 (00:36 -0300)
committerSteven Verbeek <dubcanada@gmail.com>
Sat, 24 Mar 2012 03:36:54 +0000 (00:36 -0300)
1  2 
app/assets/stylesheets/common.scss
db/schema.rb

Simple merge
diff --cc db/schema.rb
Simple merge