Björn Schießle f151376ad5 remove remaining line from merge conflict

2012-10-27 17:06:13 +02:00

..

ajax

adding space between) and {

2012-09-07 15:22:01 +02:00

appinfo

automatically remove and prevent installation of apps with a require version less than the current one. We check now the first ad second part of the version number.

2012-10-02 12:10:45 +02:00

css

added revert attempt outcome messages, removed contextual ajax revert button for now as it's not functional, improved readaibility of scripts

2012-04-27 13:19:16 +01:00

js

don't call $('#found_versions').chosen(); after opening the history drop-down since no version is selected at the beginning

2012-10-27 15:50:17 +02:00

l10n

[tx-robot] updated from transifex

2012-10-23 02:06:03 +02:00

lib

remove remaining line from merge conflict

2012-10-27 17:06:13 +02:00

templates

Do urlencoding in linkTo functions

2012-09-28 22:27:52 +02:00

history.php

Space before tab fixes

2012-08-29 20:34:44 +02:00

settings-personal.php

Remove php close at end of file

2012-08-29 20:29:43 +02:00

settings.php

remove superfluous ?> at the end of .php files (left out apps/*/templates)

2012-07-09 16:51:16 +02:00