Commit graph

2 commits

Author SHA1 Message Date
Sacha Greif
35f224cdd2 Merge branch 'nova' into devel
# Conflicts:
#	README.md
#	packages/telescope-notifications/lib/notifications.js
2016-04-15 09:33:46 +09:00
Sacha Greif
b155ed49d8 clean up 2016-02-23 16:59:15 +09:00