Dan Brown a24f3d7d47 Merge branch 'master' into translations		2016-12-31 14:32:52 +00:00
..
assets	Merge branch 'master' into translations	2016-12-31 14:32:52 +00:00
lang	Created solution for JS translations	2016-12-31 14:27:40 +00:00
views	Merge branch 'master' into translations	2016-12-31 14:32:52 +00:00