Merge branch 'fix_127' into 'master'

Fix #127 and remove duplicate migration

Closes #127

See merge request federez/re2o!165

CHANGELOG.md

@@ -22,6 +22,19 @@ rm static/css/jquery-ui-timepicker-addon.css
 ```
 
 
+## MR 159: Graph topo & MR 164: branche de création de graph
+
+Add a graph of the network topology
+Install *graphviz*:
+```
+apt-get -y install graphviz
+```
+Create the *media/images* directory:
+```
+mkdir -p media/images
+```
+
+
 ## MR 163: Fix install re2o
 
 Refactored install_re2o.sh script.

apt_requirements.txt

@@ -14,3 +14,4 @@ libjs-jquery
 libjs-jquery-ui
 libjs-jquery-timepicker
 libjs-bootstrap
+graphviz

machines/migrations/0081_auto_20180515_2034.py

@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.7 on 2018-05-15 18:34
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('machines', '0080_auto_20180502_2334'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='extension',
-            name='soa',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='machines.SOA'),
-        ),
-    ]