Commit graph

2 commits

Author SHA1 Message Date
Samuel Clay
d679b5ad4f Merge branch 'master' into social
* master:
  Fixing #42: a long-time bug of drag-and-drop not respecting order.
  Removing application media types from enclosures. Nobody needs that.
  Forcing Jammit asset path to be absolute, relative to configured directory.

Conflicts:
	media/js/newsblur/reader/reader.js
	utils/story_functions.py
2012-01-15 19:16:41 -08:00
Samuel Clay
9ef196f7f8 Re-arranging post jammit merge. 2012-01-03 09:34:50 -08:00
Renamed from media/js/jquery.tinysort.js (Browse further)