summaryrefslogtreecommitdiffstats
path: root/idrop-web
diff options
context:
space:
mode:
authormconway <michael.c.conway@gmail.com>2013-02-18 21:14:49 (GMT)
committer mconway <michael.c.conway@gmail.com>2013-02-18 21:14:49 (GMT)
commitb8ed95f124d18e29ae7ab6143d3a788d69a7cb67 (patch)
tree7b14d335baaae813968013acd688cc492e634a6c /idrop-web
parente84e25d4e59d97033b4aa505ebb5d271fa9b8ea8 (diff)
parent6be4b899be133c6c7177924acf102a3ef54efa32 (diff)
downloadQCG-Data-b8ed95f124d18e29ae7ab6143d3a788d69a7cb67.zip
QCG-Data-b8ed95f124d18e29ae7ab6143d3a788d69a7cb67.tar.gz
QCG-Data-b8ed95f124d18e29ae7ab6143d3a788d69a7cb67.tar.bz2
Merge branch 'development' of ssh://code.renci.org/gitroot/irodsidrop into development
Diffstat (limited to 'idrop-web')
-rwxr-xr-xidrop-web/release_notes.txt10
1 files changed, 9 insertions, 1 deletions
diff --git a/idrop-web/release_notes.txt b/idrop-web/release_notes.txt
index b72570a..62e42ba 100755
--- a/idrop-web/release_notes.txt
+++ b/idrop-web/release_notes.txt
@@ -1,11 +1,19 @@
+<<<<<<< HEAD
+
+*'''Project''': idrop-web version 2
+*'''Date''': 02/11/2013
+*'''Release Version''': 2.0.0-beta1
+*'''git tag''': 2.0.0-beta1
+=======
*'''Project''': idrop-web
*'''Date''': 02/13/2013
*'''Release Version''': 2.0.0-beta1
*'''git tag''': 2.0.0-beta1
+>>>>>>> a0b1644912dcc14325344b3e988b0c27d146d32a
==News==
-This is a release of iDrop web with the version 2.0 redesign work
+This is a beta release of iDrop web with the version 2.0 redesign work
==Requirements==