Merge branch 'master' of github.com:okfn/recline

Conflicts:
	demo/index.html
	demo/js/app.js
	src/recline.js
This commit is contained in:
rgrp
2011-11-03 18:31:00 +00:00
10 changed files with 4008 additions and 651 deletions

View File

@@ -6,7 +6,6 @@
<link rel="stylesheet" href="qunit/qunit.css" type="text/css" media="screen" />
<script src="../src/deps-min.js"></script>
<script src="../vendor/backbone/0.5.1/backbone.js"></script>
<script type="text/javascript" src="qunit/qunit.js"></script>
<script type="text/javascript" src="../src/dataset.js"></script>