Ingo Schommer 6ee0d53f40 Fixed merge error (mainly new translation entity format in templates) ...

Merge error from 2a35f2f928059620aa55a41458af48c0effb8ced,
which was then further regressed by Sam running the text collector
on those faulty templates: 750b5b4079510ff1edc16dadf5a8b2a65258c072

2013-08-09 15:27:28 +02:00

..

code

Merge remote-tracking branch 'origin/3.1'

2013-08-07 17:34:11 +02:00

css

Merge remote-tracking branch 'origin/3.1'

2013-08-03 19:47:32 +02:00

images

Fixed Tab floating in CMS (fixes #1778)

2013-06-13 00:04:56 +02:00

javascript

Merge branch '3.1'

2013-07-05 10:22:58 +12:00

scss

Merge remote-tracking branch 'origin/3.1'

2013-08-03 19:47:32 +02:00

templates

Fixed merge error (mainly new translation entity format in templates)

2013-08-09 15:27:28 +02:00

tests

FIX extra_requirements to accept non associative arrays.

2013-06-02 13:37:34 +12:00

thirdparty

Updated history.js dependency

2013-03-20 00:46:32 +01:00

_config.php

NEW: More helpful message for 'sake dev/build' on new envs.

2013-05-30 16:49:43 +12:00

.gitignore

MINOR Removing executable flag from all files (thanks miiihi)

2011-09-18 22:04:02 +02:00

config.rb

MINOR Removing compass asset_cache_buster functionality, as it wrongly changes the hashes even if files haven't changed, causing merging hassles - leave cache control to the webserver

2011-12-20 17:46:43 +01:00