Thibault Duplessis 87c764f3f7 Merge branch 'master' into relay ... * master: Manually apply translations simplify study API schedule anniversary tournaments - closes #3663 Fix inaccurate "user(s) on these IPs"		2017-10-02 08:03:51 -05:00
..
actor	remove dead code and unused imports	2017-01-15 13:26:08 +01:00
controllers	edit relay	2017-10-01 17:56:57 -05:00
mashup	reformat (scalariform upgrade)	2017-08-23 18:56:39 -05:00
templating	Steroids refactor: AnyVal and @inline	2017-09-29 02:05:31 -04:00
ui	refactor string/html helpers	2017-08-24 09:33:35 -05:00
views	Merge branch 'master' into relay	2017-10-02 08:03:51 -05:00
Env.scala	relay WIP	2017-09-19 21:24:59 -05:00
Global.scala	Revert "Merge branch 'scala-2.12-play-2.6' of github.com:ornicar/lila"	2017-09-09 10:01:35 -05:00
package.scala