usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject [33/52] [abbrv] git commit: Merge branch 'pr/73'. This closes #73
Date Wed, 03 Sep 2014 22:11:28 GMT
Merge branch 'pr/73'.  This closes #73

Conflicts:
	.gitignore


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/cd4915a9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/cd4915a9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/cd4915a9

Branch: refs/heads/two-dot-o-push-notifications
Commit: cd4915a9ee4ee9ff5a50a0d5bd28f3b164934427
Parents: 676520c b6100f3
Author: Dave Johnson <snoopdave@apache.org>
Authored: Fri Aug 29 17:35:50 2014 -0400
Committer: Dave Johnson <snoopdave@apache.org>
Committed: Fri Aug 29 17:35:50 2014 -0400

----------------------------------------------------------------------
 .gitignore          | 2 ++
 portal/Gruntfile.js | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cd4915a9/.gitignore
----------------------------------------------------------------------
diff --cc .gitignore
index 2dc1df4,df2938f..b0a497d
--- a/.gitignore
+++ b/.gitignore
@@@ -56,4 -54,5 +56,6 @@@ portal/js/templates.j
  /portal/js/generated/
  
  /portal/js/generated-templates/
 +/release/target/
+ 
+ /portal/seleniumLog.txt

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cd4915a9/portal/Gruntfile.js
----------------------------------------------------------------------


Mime
View raw message