Permalink
Browse files

Merge branch 'one' of https://github.com/tatsumihiroki/clubgalre into…

… one

Conflicts:
	app/assets/stylesheets/photos.css.scss
  • Loading branch information...
2 parents 6436baf + 589b19f commit d7726cfbebc38ef3a0c5f25dc240be72b27a010e @wacky wacky committed May 22, 2013
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -1,5 +1,5 @@
body {
- background-color: #fff;
+ background-color: #FDFDFD;
color: #333;
font-family: verdana, arial, helvetica, sans-serif;
font-size: 13px;
View
Binary file not shown.

0 comments on commit d7726cf

Please sign in to comment.