Skip to content

Commit

Permalink
Merge branch 'master' of github.com:open-source-society/computer-science
Browse files Browse the repository at this point in the history
Conflicts:
	README.md
  • Loading branch information
ericdouglas committed Oct 19, 2015
2 parents 3a93940 + db0350e commit fd01209
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,14 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [1.2.5] 2015-10-19
## [1.2.6] 2015-10-19
### Added
- Badge/Link to the Awesome list

## [1.2.5] 2015-10-16
### Fixed
- Fix name of the section and add a hyperlink to it.

## [1.2.4] 2015-10-14
### Removed
- Removed citation about public commitment
Expand Down
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ Search such specializations in the following platforms:

This guide was developed to be consumed in a linear approach. What does this mean? That you should complete one course at a time.

The courses are **already** in the order that you should complete them. Just start in the **Introduction** section and after finishing the first course, start the next one.
The courses are **already** in the order that you should complete them. Just start in the [Introduction to Computer Science](#introduction-to-computer-science) section and after finishing the first course, start the next one.

**If the course isn't open, do it anyway with the resources from the previous class.**

Expand Down Expand Up @@ -411,11 +411,9 @@ The **only things** that you need to know are how to use **Git** and **GitHub**.
- [Git Immersion](http://gitimmersion.com/index.html)
- [How to Use Git and GitHub](https://www.udacity.com/course/how-to-use-git-and-github--ud775)



## Change Log

**Curriculum Version**: `1.3.4`
**Curriculum Version**: `1.2.6`

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 fd01209

Please sign in to comment.