Matthieu 485140e18d Merge branch 'master' into 'click_notifications' ... # Conflicts: # app/src/main/java/org/pixeldroid/app/posts/feeds/cachedFeeds/notifications/NotificationsFragment.kt		2021-10-07 21:20:58 +00:00
..
src	Merge branch 'master' into 'click_notifications'	2021-10-07 21:20:58 +00:00
.gitignore
build.gradle	Release beta4	2021-09-25 14:20:28 +02:00
licenses.yml	Notifications: initial implementation	2021-09-25 11:52:18 +00:00
proguard-rules.pro	rename app id	2021-04-22 11:47:18 +02:00