[sagenb] 92/179: Merge pull request #152 from ohanar/flask_version

[felix salfelder]

This is an automated email from the git hooks/post-receive script.

felix-guest pushed a commit to branch master
in repository sagenb.

commit 4c40f2ed87cf8e191dd439f1d352103e10419845
Merge: 64cc9cf 6790641
Author: Keshav Kini <keshav.kini+github at gmail.com>
Date:   Fri Apr 5 14:59:21 2013 -0700

    Merge pull request #152 from ohanar/flask_version
    
    Make flask_version a submodule of sagenb

 flask_version/admin.py             |  8 ++---
 flask_version/authentication.py    | 10 +++---
 flask_version/base.py              | 16 ++++++----
 flask_version/doc.py               |  4 +--
 flask_version/settings.py          |  2 +-
 flask_version/worksheet.py         | 64 +++++++++++++++++++-------------------
 flask_version/worksheet_listing.py | 18 +++++------
 sagenb/flask_version               |  1 +
 sagenb/notebook/run_notebook.py    |  5 +--
 setup.py                           |  1 +
 10 files changed, 66 insertions(+), 63 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagenb.git