Merge remote branch 'origin/development' into text_themes
authorCory Chaplin <cory.chaplin@laposte.net>
Mon, 31 Mar 2014 14:15:26 +0000 (16:15 +0200)
committerCory Chaplin <cory.chaplin@laposte.net>
Mon, 31 Mar 2014 14:15:26 +0000 (16:15 +0200)
commitd27a09e5fdb30b7ee7d6b4f05591e82a00e1e222
tree1f4c980f01ba4e0de56d1393c58ba7a42ad308e4
parenta3413d19d5aed6cc0ea5c35e2467738ecb852495
parentf2208cbbcc8b23c43c334624898ce7c7af158f4f
Merge remote branch 'origin/development' into text_themes

Conflicts:
client/build.js
client/src/models/network.js
client/src/translations/es.po
server/settingsgenerator.js
25 files changed:
client/build.js
client/src/app.js
client/src/index.html.tmpl
client/src/models/application.js
client/src/models/network.js
client/src/translations/cs.po
client/src/translations/de-de.po
client/src/translations/en-gb.po
client/src/translations/es-419.po
client/src/translations/es.po
client/src/translations/fr.po
client/src/translations/he.po
client/src/translations/it.po
client/src/translations/nl.po
client/src/translations/no.po
client/src/translations/pl.po
client/src/translations/pt-br.po
client/src/translations/ro.po
client/src/translations/ru.po
client/src/translations/tr.po
client/src/translations/uk.po
client/src/translations/vi.po
client/src/translations/zh-tw.po
client/src/views/channel.js
server/settingsgenerator.js