~linaro-infrastructure/linaro-ci-dashboard/admin-app-openid

Merging trunk and resolving conflicts.

dashboard/templates/frontend/home.html => dashboard/frontend/templates/home.html

dashboard/templates/frontend/index.html => dashboard/frontend/templates/index.html

added added

removed removed

#!/usr/bin/env python

# This file is part of linaro-ci-dashboard.

# linaro-ci-dashboard is free software: you can redistribute it and/or modify

# it under the terms of the GNU Affero General Public License as published by

# the Free Software Foundation, either version 3 of the License, or

# (at your option) any later version.

# linaro-ci-dashboard is distributed in the hope that it will be useful,

# but WITHOUT ANY WARRANTY; without even the implied warranty of

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

# GNU Affero General Public License for more details.

# You should have received a copy of the GNU Affero General Public License

# along with linaro-ci-dashboard. If not, see <http://www.gnu.org/licenses/>.

from django.db import models

# Create your models here.