Merge remote-tracking branch 'stig/patch-1'
f1cb24b9c2cc
Actions

Authored by Justin Spahr-Summers <Justin.SpahrSummers@gmail.com> on Aug 27 2012, 12:29.

Description

Merge remote-tracking branch 'stig/patch-1'

Conflicts:
Objective-C.gitignore

Committed

Justin Spahr-Summers <Justin.SpahrSummers@gmail.com>

Aug 27 2012, 12:29

Pushed

aubort

Jul 2 2018, 16:12

Parents

Branches

Unknown

Tags

Unknown

Justin Spahr-Summers <Justin.SpahrSummers@gmail.com> committed rGITIGNOREf1cb24b9c2cc: Merge remote-tracking branch 'stig/patch-1' (authored by Justin Spahr-Summers <Justin.SpahrSummers@gmail.com>).Aug 27 2012, 12:29

	Commit			Author	Details	Committed
	6670a4c42336			Stig Brautaset	Ignore .idea/ folder for AppCode users.	May 1 2012

				Path
	M			Objective-C.gitignore