Commit b54944a3 authored by Celine Noirot's avatar Celine Noirot

Merge branch 'dev' into 'issue#161'

# Conflicts:
#   ui/nG6/res/js/tx_nG6_pi6.js
parents 7789af45 d332661f
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