Roeland Jago Douma f03aa0480a Merge pull request #7316 from nextcloud/fix-silent-conflicts-due-to-merging-7256-after-7251 ... Fix silent conflicts due to merging #7256 after #7251		2017-11-29 15:38:24 +01:00
..
appinfo	Update license headers	2017-11-06 16:56:19 +01:00
composer	update autoloader	2017-11-01 16:30:20 +01:00
css	Fix silent conflicts due to merging #7256 after #7251	2017-11-28 02:35:39 +01:00
img	Use PNG version of the icons for shipped activities	2017-06-20 13:48:51 +02:00
js	Merge pull request #7256 from nextcloud/fix-cursor-for-avatar-and-user-names-in-comments	2017-11-27 15:14:40 +01:00
l10n	[tx-robot] updated from transifex	2017-11-29 01:10:12 +00:00
lib	Fix unit tests	2017-11-27 08:50:44 +01:00
tests	Fix unit tests	2017-11-27 08:50:44 +01:00
.bowerrc	add At.js and dependencies	2017-10-22 14:14:33 +02:00