Skip to content

Commit fd01209

Browse files
committed
Merge branch 'master' of github.com:open-source-society/computer-science
Conflicts: README.md
2 parents 3a93940 + db0350e commit fd01209

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
This project adheres to [Semantic Versioning](http://semver.org/).
55

6-
## [1.2.5] 2015-10-19
6+
## [1.2.6] 2015-10-19
77
### Added
88
- Badge/Link to the Awesome list
99

10+
## [1.2.5] 2015-10-16
11+
### Fixed
12+
- Fix name of the section and add a hyperlink to it.
13+
1014
## [1.2.4] 2015-10-14
1115
### Removed
1216
- Removed citation about public commitment

README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ Search such specializations in the following platforms:
331331

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

334-
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.
334+
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.
335335

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

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

414-
415-
416414
## Change Log
417415

418-
**Curriculum Version**: `1.3.4`
416+
**Curriculum Version**: `1.2.6`
419417

420418
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.
421419

0 commit comments

Comments
 (0)