merging/rebasing/i'm confused to be honest

This commit is contained in:
Skud committed 2013-08-07 14:03:35 +10:00
commit f34afae097
1 file changed
+1 -1
+1 -1
View File
@@ -1,4 +1,4 @@
%h1= Growstuff::Application.config.site_name
.span12
.row-fluid
.span8.info