Graham Campbell df373e93ef Merge branch '2.2' into 2.3 ...

# Conflicts:
#	composer.lock

2016-04-27 14:58:20 +01:00

..

assets

Always show vertical scrollbar

2016-04-27 10:14:14 +02:00

lang

Refactored the way we store metrics

2016-04-25 20:42:00 +01:00

views

Merge branch '2.2' into 2.3

2016-04-27 14:58:20 +01:00