Skip to content

Commit

Permalink
Merge pull request #6 from edx/release
Browse files Browse the repository at this point in the history
Release 2013-05-29, with Hotfix 2013-05-30 back into master
  • Loading branch information
marcotuts committed May 30, 2013
2 parents e17f9f6 + 3614a72 commit 46967a7
Show file tree
Hide file tree
Showing 15 changed files with 38,070 additions and 7 deletions.
38,067 changes: 38,067 additions & 0 deletions common/static/js/vendor/pdfjs/pdf.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion common/static/js/vendor/pdfjs/pdf.js.REMOVED.git-id

This file was deleted.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

This file was deleted.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

This file was deleted.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

This file was deleted.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

This file was deleted.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

This file was deleted.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

This file was deleted.

3 changes: 3 additions & 0 deletions rakefiles/assets.rake
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ end
# the ENV_TOKENS to the templating context.
def preprocess_with_mako(filename)
# simple command-line invocation of Mako engine
# cdodge: the .gsub() are used to translate true->True and false->False to make the generated
# python actually valid python. This is just a short term hack to unblock the release train
# until a real fix can be made by people who know this better
mako = "from mako.template import Template;" +
"print Template(filename=\"#{filename}\")" +
# Total hack. It works because a Python dict literal has
Expand Down

0 comments on commit 46967a7

Please sign in to comment.