Merge lara.matcom.uh.cu:programs/dpto2

Conflicts:
	main.py
This commit is contained in:
Andy Teijelo 2015-11-02 18:12:15 -05:00
commit ba036d26b7

View file

@ -61,6 +61,8 @@ def index():
@app.route("/login",methods=['GET','POST'])
def login():
if session.get('logged_in',False):
return redirect(url_for('admin'))
if request.method == 'GET':
return render_template("login.html")
if request.method == 'POST':