1
0
mirror of https://github.com/github/gitignore synced 2024-12-05 01:45:42 +01:00

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Jens Jahnke 2013-06-19 09:02:51 +02:00
commit c5bed55855

View File

@ -1,4 +1,4 @@
Copyright (c) 2012 GitHub, Inc.
Copyright (c) 2013 GitHub, Inc.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),