Merge remote branch 'origin/development' into text_themes
authorCory Chaplin <cory.chaplin@laposte.net>
Mon, 31 Mar 2014 20:47:53 +0000 (22:47 +0200)
committerCory Chaplin <cory.chaplin@laposte.net>
Mon, 31 Mar 2014 20:47:53 +0000 (22:47 +0200)
commit8fbf9f284eaef116878781dac84cc1de3dcc0782
tree6314a20676806d241011989ba4139a17ab7558f8
parentb62f086ffe6a7171f147442cd36e78bb181cd467
parent6b8fbed0c4a08bf883e95cc777977c7acf16e6e6
Merge remote branch 'origin/development' into text_themes

Conflicts:
client/src/app.js
client/src/app.js
client/src/index.html.tmpl
client/src/models/application.js