Merge branch 'dev'

diff --cc teleforma/management/commands/teleforma-export-wifi-accounts.py
index db7b760ce406464a0188f21b0a320dab19475900,23984144960b7355e676530474adaebfcd4d0626..c4b15f75d767410836120c8c915c02914b24c394
--- 1/teleforma/management/commands/teleforma-export-wifi-accounts.py
--- 2/teleforma/management/commands/teleforma-export-wifi-accounts.py
+++ b/teleforma/management/commands/teleforma-export-wifi-accounts.py
@@@ -42,6 -39,6 +39,10 @@@ class Command(BaseCommand)
                      data.append(p.wifi_pass)
                      data.append('\n')
                      s = ','.join(data)
++<<<<<<< HEAD
 +                    f.write(s)
++=======
+         f.write(s)
++>>>>>>> dev
          f.close()
  

diff --cc teleforma/management/commands/teleforma-init-wifi-pass.py
Simple merge