Skip to content

Commit

Permalink
Merge pull request ossu#138 from ramirio/master
Browse files Browse the repository at this point in the history
Add Git - the simple guide to the prerequisite section
  • Loading branch information
ericdouglas committed Oct 11, 2015
2 parents 2addd37 + e76f224 commit 960af06
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [1.2.1] 2015-10-11
### Added
- Article Git - the simple guide to the prerequisite section.

##[1.1.1] 2015-10-11
### Fixed
- Fix typos
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,7 @@ You must share **only** files that you are **allowed** to! **Do NOT disrespect t
The **only things** that you need to know are how to use **Git** and **GitHub**. Here are some resources to learn about them:

- [Try Git](https://try.github.io/levels/1/challenges/1)
- [Git - the simple guide] (http://rogerdudler.github.io/git-guide/)
- [GitHub Training & Guides](https://www.youtube.com/playlist?list=PLg7s6cbtAD15G8lNyoaYDuKZSKyJrgwB-)
- [GitHub Hello World](https://guides.github.com/activities/hello-world/)
- [Git Immersion](http://gitimmersion.com/index.html)
Expand All @@ -407,7 +408,7 @@ The **only things** that you need to know are how to use **Git** and **GitHub**.

## Change Log

**Curriculum Version**: `1.1.1`
**Curriculum Version**: `1.2.1`

To show **respect** to all of our students, we will keep a [CHANGELOG](CHANGELOG.md) file that contains all the alterations that our curriculum may suffer.

Expand Down

0 comments on commit 960af06

Please sign in to comment.