Permalink
Browse files

Merge pull request #1677 from shackbarth/haxtuple2

added xtupleU and haxTuple links to readme
  • Loading branch information...
2 parents 3e66fa6 + bca3ac5 commit 78951878fd8636a05459d91be575c52f27c614e4 @gilmoskowitz gilmoskowitz committed Jul 18, 2014
Showing with 5 additions and 4 deletions.
  1. +5 −4 README.md
View
@@ -46,7 +46,8 @@ In the month of August, we will be running haxTuple 2014. As in previous incarna
we will open up our bug-shooting derby for the Qt client to our community, with prizes
for the most effective bugsquashers! In this year's event, we will also introduce our
new technologies by opening up our webapp for haxxing. Those who write the best
-JavaScript extensions or REST clients will get prizes. More details to follow.
+JavaScript extensions or REST clients will get prizes. More details
+[here](https://github.com/xtuple/xtuple/wiki/haxTuple-2014).
Also, don't miss the xTuple event of the year!
[xTupleCon 2014](http://www.xtuple.com/xtuple-conference-2014)
@@ -63,8 +64,8 @@ The best way to start coding on our stack is to use our
View the [Release Notes](RELEASE.md) to see a change log.
### Additional Resources
-
- * [Setting up a non-development demo environment](https://github.com/xtuple/xtuple/wiki/How-to-set-up-xTuple)
* [Building an Extension Tutorial](https://github.com/xtuple/xtuple-extensions/blob/master/docs/TUTORIAL.md)
- * [API documentation](http://xtuple.com/jsdoc)
* [Developer Wiki](https://github.com/xtuple/xtuple/wiki)
+ * xTuple U [Tutorial Videos](https://github.com/xtuple/xtuple/wiki/Tutorial-Videos)
+ * [API documentation](http://xtuple.com/jsdoc)
+ * [Setting up a non-development demo environment](https://github.com/xtuple/xtuple/wiki/How-to-set-up-xTuple)

0 comments on commit 7895187

Please sign in to comment.