nodiscc a5fbc689f8 Remove merge conflict leftover ... Fixes #900		2017-07-11 14:30:14 +02:00
..
default	Remove merge conflict leftover	2017-07-11 14:30:14 +02:00
vintage	Merge pull request #841 from ArthurHoaro/feature/search-no-tag	2017-05-25 15:54:20 +02:00