Pfingstfrosch a3f7066cc1 Merge branches 'projects_search' and 'user_based_+_sortable_favs'
# Conflicts:
#	app/assets/stylesheets/favorites.scss
2020-05-29 15:48:58 +02:00
..
2020-05-29 15:47:20 +02:00