rezometz
/
re2o
mirror of https://gitlab.federez.net/re2o/re2o
8
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Merge branch 'mergeupstream' into 'master' 

Mergeupstream

See merge request nounous/re2o!2
upstream
Gabriel Detraz 8 years ago
parent
17d2c81df0 7be0b98905
commit
f77c3692d2
2 changed files with 1 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      preferences/migrations/0030_merge_20180320_1419.py
  2. 0
      users/management/commands/chsh.py

2
preferences/migrations/0030_merge_20180319_0149.py → preferences/migrations/0030_merge_20180320_1419.py
View File

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Generated by Django 1.10.7 on 2018-03-19 00:49 # Generated by Django 1.10.7 on 2018-03-20 13:19
from __future__ import unicode_literals from __future__ import unicode_literals
from django.db import migrations from django.db import migrations

0
users/management/commands/chsh.py
View File

Write Preview
Loading…
Cancel
Save