Merge remote-tracking branch 'origin/master' into persona

This commit is contained in:
psychobunny
2015-03-17 11:17:29 -04:00
2 changed files with 14 additions and 2 deletions

View File

@@ -0,0 +1,12 @@
<script>
require.config({
baseUrl: "{relative_path}/src/modules",
waitSeconds: 3,
urlArgs: "{cache-buster}",
paths: {
'forum': '../forum',
'vendor': '../../vendor',
'mousetrap': '../../bower/mousetrap/mousetrap'
}
});
</script>