Skip to content
Browse files

Merge branch 'master' of https://github.com/SE-Team/project-x

  • Loading branch information...
2 parents 061ce75 + abc838b commit bfb954a8781fd0be6f0717d1af4e09e496ca2af5 @ghostandthemachine ghostandthemachine committed Dec 12, 2012
View
BIN lib/public/images/index/Calendar3.png
Deleted file not rendered
View
BIN lib/public/images/index/Project-X.png
Deleted file not rendered
View
BIN lib/public/images/index/calendar2.png
Deleted file not rendered
View
BIN lib/public/images/index/project-x_2.PNG
Deleted file not rendered
View
BIN lib/public/images/index/project-x_3.png
Deleted file not rendered
View
BIN lib/public/images/index/project-x_4.png
Deleted file not rendered
View
BIN lib/public/images/index/project-x_5.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
2 lib/views/index.haml
@@ -13,7 +13,7 @@
#myCarousel.carousel.slide.offset1.span9.well
.carousel-inner
.item.active
- %img{:alt => "", :src => "images/index/project-x_4.png"}
+ %img{:alt => "", :src => "images/index/project-x_5.png"}
.carousel-caption
%h4 Search for upcoming Events
%p Use the search option to find out about upcoming events you don't want to miss! We offer you access to olur vast database which is connected with diverse sources such as BG TV and Google.

0 comments on commit bfb954a

Please sign in to comment.
Something went wrong with that request. Please try again.