andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/Inachos/fetsite into testgallery

Browse Source 
Conflicts:
	app/views/layouts/application.html.erb
This commit is contained in:
Andreas Stephanides
2015-01-15 15:40:36 +01:00
parent 565024c282 48e3c1149a
commit 43a551fc28
56 changed files with 1154 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/stylesheets/themes/blue1/application.css.scss
View File

@@ -15,7 +15,6 @@
*= require jquery.datetimepicker
*= require jquery.ui.dialog
* require 'bootstrap'
* require 'neuigkeiten'
*/