Merge branch 'railshosting' of git.ungleich.ch:dynamicweb into feature/integrate-railshosting
Conflicts:
dynamicweb/settings.py
Added railshosting app and deleted .settings_local import.
dynamicweb/urls.py
Added railshosting url.
Signed-off-by: rscnt <rascnt@gmail.com>
This commit is contained in:
commit
5d9c306573
85 changed files with 15745 additions and 6 deletions
19
digital_glarus/migrations/0002_auto_20150527_1023.py
Normal file
19
digital_glarus/migrations/0002_auto_20150527_1023.py
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import models, migrations
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('digital_glarus', '0001_initial'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='message',
|
||||
name='email',
|
||||
field=models.EmailField(max_length=75),
|
||||
),
|
||||
]
|
||||
Loading…
Add table
Add a link
Reference in a new issue