Merge remote-tracking branch 'origin/notif_sync' into unread_sync

This commit is contained in:
David Baker 2016-01-07 11:44:50 +00:00
commit ba51c68844
81 changed files with 1788 additions and 778 deletions

View file

@ -1,5 +1,5 @@
/*
Copyright 2015 OpenMarket Ltd
Copyright 2015, 2016 OpenMarket Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.