Commit f77c3692 authored by Gabriel Detraz's avatar Gabriel Detraz

Merge branch 'mergeupstream' into 'master'

Mergeupstream

See merge request !2
parents 17d2c81d 7be0b989
# -*- 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
......
File mode changed from 100755 to 100644
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