gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'final_questions' of https://github.com/differentreality/osem into differentreality-final_questions

Browse source 
Conflicts:
	app/models/conference.rb
	config/routes.rb
This commit is contained in:
Henne Vogelsang 2014-03-03 10:43:38 +01:00
commit 243ea41456
28 changed files with 342 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/assets/javascripts/application.js
View file

@ -20,4 +20,9 @@
//= require bootstrap
//= require osem
//= require d3.v3
//= require d3.v3.min
//= require d3.v3.min
$(document).ready(function() {
$('a[disabled=disabled]').click(function(event){
return false;
});
});