Ben Gotow 13870fecd5 Merge branch 'master' into unified-inbox ... # Conflicts: # internal_packages/events/lib/event-header.cjsx # spec/stores/file-download-store-spec.coffee # spec/tasks/event-rsvp-spec.coffee # src/flux/tasks/event-rsvp.coffee		2016-01-12 08:20:55 -08:00
..
lib	Merge branch 'master' into unified-inbox	2016-01-12 08:20:55 -08:00
spec	fix(quoted-text): Fix + test case for Sentry 8323, body el is quoted text	2016-01-11 11:14:34 -08:00
stylesheets	fix(notifications): Buttons always triggered default action	2015-10-28 10:47:44 -07:00
package.json	fix(license): GPLv3 => GPL-3.0	2015-12-07 10:50:47 -08:00