Skip to content
Find file Blame History Permalink
  • Cyrille's avatar
    Merge branch 'master' into 'master' · 9e5a4524
    Cyrille authored 
    # Conflicts:
#   www/bundledResources/uilocales.d/fr-utf8.conf
#   www/bundledResources/uilocales.d/it-utf8.conf
#   www/bundledResources/uilocales.d/lt-utf8.conf
    9e5a4524