yflory 69fb8b4d2f Merge branch 'master' into soon		2017-01-23 15:13:26 +01:00
..
assert	Stop failing tests over missing translations because otherwise they'll almost never be passing.	2017-01-12 12:06:44 +01:00
code	Fix the NoScript (iframe not loaded) bug with inner iframes	2017-01-23 15:07:38 +01:00
common	make sure that /pad is resized after loading	2017-01-09 17:02:01 +01:00
examples	clean up unused files	2017-01-11 07:49:56 +01:00
file	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-01-02 15:43:06 +01:00
pad	Merge branch 'master' into soon	2017-01-23 15:13:26 +01:00
poll	Fix the title reset bug	2017-01-12 14:29:40 +01:00
slide	Fix the NoScript (iframe not loaded) bug with inner iframes	2017-01-23 15:07:38 +01:00
user	make panel styles reusable	2016-12-30 15:30:35 +01:00