Skip to content

Commit

Permalink
Merge pull request #70 from v1s1t0r1sh3r3/dev
Browse files Browse the repository at this point in the history
Dev to master. Still v6.11
  • Loading branch information
OscarAkaElvis authored Mar 21, 2017
2 parents eb28712 + 9b50880 commit 2985797
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
6 changes: 5 additions & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
- Please, answer the questions to provide maximum of info.<br/>
- Answer ALWAYS in english.<br/>
- If more info is needed and requested by airgeddon staff but there is no answer in 10 days, the issue will be closed.

#### What is your airgeddon version?

*Insert answer here*
Expand All @@ -12,4 +16,4 @@

#### Describe the issue and the steps to reproduce it

*Insert description here*
*Insert description here. Screenshots or any clarifying info are welcome too*
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ Please note we have a code of conduct, please follow it in all your interactions
3. Use **LF** (Unix) line break type (not CR or CRLF).
4. Use [Shellcheck] to search for errors and warnings on code. (Thanks [xtonousou] for the tip :wink:). To avoid false positive warnings you must launch shellcheck using `-x` argument to follow source files and from the directory where `airgeddon.sh` is. For example: `cd /path/to/airgeddon && shellcheck -x airgeddon.sh`
5. Increase the version numbers in `airgeddon.sh`, in [Readme] and in [Changelog] to the new version that the script represents. The versioning scheme we use is *X.YZ*. Where:
- *X* is a major release with a new menu (e.g. WPS menu)
- *Y* is a minor release with a new feature for an existing menu or a new submenu for an existing feature
- *Z* is a minor release with new bug fixes, small modifications or code improvements
- *X* is a major release with a new menu (e.g. WPS menu)
- *Y* is a minor release with a new feature for an existing menu or a new submenu for an existing feature
- *Z* is a minor release with new bug fixes, small modifications or code improvements
6. Update the date on `.sh` and `.db` files under shebang, if appropriate.
7. Split your commits into parts. Each part represents a unique change on files.
8. Direct push to [Master] is not allowed.
Expand Down
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ Compatible with any Linux distribution that has installed the tools needed. The
<li>Gentoo 20160514 and 20160704</li>
<li>Fedora 24</li>
<li>Red Hat 7 (Maipo)</li>
<li>Arch 4.6.2-1 to 4.10.3-1</li>
<li>Arch 4.6.2-1 to 4.10.4-1</li>
<li>Raspbian 7 (Wheezy) and 8 (Jessie) (Raspberry Pi)</li>
<li>OpenMandriva LX3</li>
</em>
Expand Down Expand Up @@ -281,6 +281,9 @@ Use it on your own networks or with the permission of the network's owner only.<
- Goyfilms &#8594; Goyscript
- [Kcdtv] &#8594; WPSPin

<!-- Anchors -->
[Requirements]: #requirements
[Supported Languages]: #supported-languages
<!-- Links To Images -->
[Banner]: /imgs/banners/airgeddon_banner.png "We will conquer the earth!!"
[English]: /imgs/flags/us.png "English"
Expand Down

0 comments on commit 2985797

Please sign in to comment.