Commit 94e476b0 authored by Serge S. Koval's avatar Serge S. Koval

Merge.

parents 74a4c616 14750e10
from flask.ext.babel import gettext from flask.ext.admin.babel import gettext
from flask.ext.admin.model import filters from flask.ext.admin.model import filters
from flask.ext.admin.contrib.sqlamodel import tools from flask.ext.admin.contrib.sqlamodel import tools
......
...@@ -5,8 +5,8 @@ from sqlalchemy import or_ ...@@ -5,8 +5,8 @@ from sqlalchemy import or_
from wtforms.ext.sqlalchemy.orm import model_form from wtforms.ext.sqlalchemy.orm import model_form
from flask import flash from flask import flash
from flask.ext.babel import gettext
from flask.ext.admin.babel import gettext
from flask.ext.admin.form import BaseForm from flask.ext.admin.form import BaseForm
from flask.ext.admin.model import BaseModelView from flask.ext.admin.model import BaseModelView
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment