Thibault Duplessis 58720bff80 Merge branch 'master' into puzzle ... * master: admin challenge API scala syntax Update sbt to 1.4.5 fix importGame err is no longer a list New Crowdin updates (#7698) disarm another ref link remove captcha on team join request simplify monitoring after fishnet 2		2020-12-14 16:08:24 +01:00
..
BuildSettings.scala	256m is more than enough to run lila in dev	2020-12-11 15:00:08 +01:00
Dependencies.scala	Update google-auth-library-oauth2-http to 0.22.2	2020-12-11 22:49:50 +01:00
MessageCompiler.scala	scalafmt 2.7.1	2020-09-21 09:28:28 +02:00
build.properties	Update sbt to 1.4.5	2020-12-14 10:03:51 +01:00
plugins.sbt	Update sbt-bloop to 1.4.6	2020-12-03 14:48:45 +01:00