From da5c61afe447ae397b45fc4aa94a8232e6e20939 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= <paul@oshannessy.com>
Date: Mon, 4 Nov 2013 11:27:54 -0800
Subject: [PATCH] Oxford comma

---
 src/core/ReactCompositeComponent.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/ReactCompositeComponent.js b/src/core/ReactCompositeComponent.js
index 3f7b3efd57..8edbc81ff0 100644
--- a/src/core/ReactCompositeComponent.js
+++ b/src/core/ReactCompositeComponent.js
@@ -861,7 +861,7 @@ var ReactCompositeComponentMixin = {
     invariant(
       ReactComponent.isValidComponent(renderedComponent),
       '%s.render(): A valid ReactComponent must be returned. You may have ' +
-      'returned null, undefined, an array or some other invalid object.',
+      'returned null, undefined, an array, or some other invalid object.',
       this.constructor.displayName || 'ReactCompositeComponent'
     );
     return renderedComponent;