Sander Mathijs van Veen 388bdb396f Fix merge conflict. 13 gadi atpakaļ
..
css 388bdb396f Fix merge conflict. 13 gadi atpakaļ
js 388bdb396f Fix merge conflict. 13 gadi atpakaļ