Merge branch 'dev'

This commit is contained in:
Thomas FORGIONE 2015-10-09 10:03:12 +02:00
commit 82f30efa65
1 changed files with 0 additions and 1 deletions

View File

@ -697,7 +697,6 @@ DBReq.ExpCreator.prototype.execute = function() {
" Scene.name != 'peachcastle' AND\n" + " Scene.name != 'peachcastle' AND\n" +
" CoinCombination.id = Experiment.coin_combination_id AND\n" + " CoinCombination.id = Experiment.coin_combination_id AND\n" +
" Other.id = Experiment.user_id AND\n" + " Other.id = Experiment.user_id AND\n" +
" Other.valid IS true AND\n" +
" Experiment.finished = true AND\n" + " Experiment.finished = true AND\n" +
" Other.rating = U.rating AND\n" + " Other.rating = U.rating AND\n" +
" Other.id != U.id AND\n" + " Other.id != U.id AND\n" +