Merge branch 'mergeupstream' into 'master'

Mergeupstream See merge request nounous/re2o!2
8 years ago · f77c3692d2
2 changed files with 1 additions and 1 deletions
--- a/preferences/migrations/0030_merge_20180320_1419.py
+++ b/preferences/migrations/0030_merge_20180320_1419.py
@ -1,5 +1,5 @@
 # -*- 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 django.db import migrations
--- a/users/management/commands/chsh.py
+++ b/users/management/commands/chsh.py